diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-10-10 13:21:22 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-10-10 13:21:22 +0100 |
| commit | 189c7c80c9e56d09d8dd441a924d687aa2b9ed5e (patch) | |
| tree | 8aac4844a602458276b8d61f8482b31bae865d67 /app/models | |
| parent | 247a24cde3954b7f7b3cbb2e3b624669b6e6e61d (diff) | |
| parent | f6b93d8cb5fbe4e4d2c96bf732f76102d54ce9cd (diff) | |
Merge branch 'release/0.4' into develop
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/public_body.rb | 8 | ||||
| -rw-r--r-- | app/models/track_mailer.rb | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/app/models/public_body.rb b/app/models/public_body.rb index 311e19001..ab836657b 100644 --- a/app/models/public_body.rb +++ b/app/models/public_body.rb @@ -378,7 +378,7 @@ class PublicBody < ActiveRecord::Base next if name.nil? name.strip! - email.strip! + email.strip! unless email.nil? if !email.nil? && !email.empty? && !MySociety::Validate.is_valid_email(email) errors.push "error: line #{line.to_s}: invalid email '#{email}' for authority '#{name}'" @@ -392,7 +392,7 @@ class PublicBody < ActiveRecord::Base PublicBody.with_locale(locale) do changed = {} field_list.each do |field_name| - localized_field_name = (locale === I18n.default_locale) ? field_name : "#{field_name}.#{locale}" + localized_field_name = (locale.to_s == I18n.default_locale.to_s) ? field_name : "#{field_name}.#{locale}" localized_value = field_names[localized_field_name] && row[field_names[localized_field_name]] # Tags are a special case, as we support adding to the field, not just setting a new value @@ -422,12 +422,12 @@ class PublicBody < ActiveRecord::Base end end else # New public body - public_body = PublicBody.new(:name=>name, :short_name=>"", :request_email=>"") + public_body = PublicBody.new(:name=>"", :short_name=>"", :request_email=>"") available_locales.each do |locale| PublicBody.with_locale(locale) do changed = {} field_list.each do |field_name| - localized_field_name = (locale === I18n.default_locale) ? field_name : "#{field_name}.#{locale}" + localized_field_name = (locale.to_s == I18n.default_locale.to_s) ? field_name : "#{field_name}.#{locale}" localized_value = field_names[localized_field_name] && row[field_names[localized_field_name]] if localized_field_name == 'tag_string' and tag_behaviour == 'add' diff --git a/app/models/track_mailer.rb b/app/models/track_mailer.rb index 85b1fedd8..0c053c4ad 100644 --- a/app/models/track_mailer.rb +++ b/app/models/track_mailer.rb @@ -40,10 +40,11 @@ class TrackMailer < ApplicationMailer # Useful query to run by hand to see how many alerts are due: # User.find(:all, :conditions => [ "last_daily_track_email < ?", Time.now - 1.day ]).size def self.alert_tracks + done_something = false now = Time.now() users = User.find(:all, :conditions => [ "last_daily_track_email < ?", now - 1.day ]) if users.empty? - return false + return done_something end for user in users next if !user.should_be_emailed? @@ -116,8 +117,9 @@ class TrackMailer < ApplicationMailer user.last_daily_track_email = now user.no_xapian_reindex = true user.save! + done_something = true end - return true + return done_something end def self.alert_tracks_loop |