diff options
| author | Seb Bacon <seb@mysociety.org> | 2012-01-09 09:37:48 +0000 |
|---|---|---|
| committer | Seb Bacon <seb@mysociety.org> | 2012-01-09 09:37:48 +0000 |
| commit | 4f8ff37a127d5f82e63f500a84d22e8b07ab8843 (patch) | |
| tree | 568a051bdf11be4099e2ac023aa0cb0d2c28594f /app/models | |
| parent | db9eb3724242e82d4275418002e135f6b1c056e9 (diff) | |
| parent | 848483381694e67999e446d3784b0c32dfdc3f8d (diff) | |
Merge branch 'release/0.5' into develop
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/about_me_validator.rb | 2 | ||||
| -rw-r--r-- | app/models/foi_attachment.rb | 4 | ||||
| -rw-r--r-- | app/models/info_request_event.rb | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/app/models/about_me_validator.rb b/app/models/about_me_validator.rb index ec2b03201..e24c5512c 100644 --- a/app/models/about_me_validator.rb +++ b/app/models/about_me_validator.rb @@ -21,7 +21,7 @@ class AboutMeValidator < ActiveRecord::BaseWithoutTable def validate if !self.about_me.blank? && self.about_me.size > 500 - errors.add(_("Please keep it shorter than 500 characters")) + errors.add(:about_me, _("Please keep it shorter than 500 characters")) end end diff --git a/app/models/foi_attachment.rb b/app/models/foi_attachment.rb index 057dcdb69..16e202bee 100644 --- a/app/models/foi_attachment.rb +++ b/app/models/foi_attachment.rb @@ -19,7 +19,7 @@ class FoiAttachment < ActiveRecord::Base before_destroy :delete_cached_file! def directory - base_dir = File.join("cache", "attachments_#{ENV['RAILS_ENV']}") + base_dir = File.join(File.dirname(__FILE__), "../../cache", "attachments_#{ENV['RAILS_ENV']}") return File.join(base_dir, self.hexdigest[0..2]) end @@ -302,7 +302,7 @@ class FoiAttachment < ActiveRecord::Base body = $1.to_s body_without_tags = body.gsub(/\s+/,"").gsub(/\<[^\>]*\>/, "") contains_images = html.match(/<img/mi) ? true : false - if !$?.success? || html.size == 0 || (body_without_tags.size == 0 && !contains_images) + if html.size == 0 || !$?.success? || (body_without_tags.size == 0 && !contains_images) ret = "<html><head></head><body>"; if self.has_google_docs_viewer? wrapper_id = "wrapper_google_embed" diff --git a/app/models/info_request_event.rb b/app/models/info_request_event.rb index 4ea89bf81..3514702da 100644 --- a/app/models/info_request_event.rb +++ b/app/models/info_request_event.rb @@ -147,6 +147,7 @@ class InfoRequestEvent < ActiveRecord::Base return event.calculated_state end end + return end def waiting_classification |