diff options
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/track_mailer.rb | 3 | ||||
-rw-r--r-- | app/models/user.rb | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/models/track_mailer.rb b/app/models/track_mailer.rb index 792191bd9..8c87d39c2 100644 --- a/app/models/track_mailer.rb +++ b/app/models/track_mailer.rb @@ -4,7 +4,7 @@ # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: track_mailer.rb,v 1.16 2009-03-17 23:22:01 francis Exp $ +# $Id: track_mailer.rb,v 1.17 2009-04-09 12:22:46 louise Exp $ class TrackMailer < ApplicationMailer def event_digest(user, email_about_things) @@ -95,6 +95,7 @@ class TrackMailer < ApplicationMailer end end user.last_daily_track_email = now + user.no_reindex = true user.save! end end diff --git a/app/models/user.rb b/app/models/user.rb index 4638583e2..f7c77af56 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -23,7 +23,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: user.rb,v 1.88 2009-04-08 07:31:07 francis Exp $ +# $Id: user.rb,v 1.89 2009-04-09 12:22:46 louise Exp $ require 'digest/sha1' @@ -43,7 +43,7 @@ class User < ActiveRecord::Base has_many :track_things, :foreign_key => 'tracking_user_id', :order => 'created_at desc' has_many :comments, :order => 'created_at desc' - attr_accessor :password_confirmation + attr_accessor :password_confirmation, :no_reindex validates_confirmation_of :password, :message =>"^Please enter the same password twice" validates_inclusion_of :admin_level, :in => [ @@ -74,6 +74,7 @@ class User < ActiveRecord::Base # requested_by: and commented_by: search queries also need updating after save after_save :reindex_referencing_models def reindex_referencing_models + return if no_reindex == true for comment in self.comments for info_request_event in comment.info_request_events info_request_event.xapian_mark_needs_index |