diff options
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 49770ba2b..d48e2975d 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.92 2009-04-21 22:48:41 francis Exp $ +# $Id: user.rb,v 1.93 2009-04-22 01:00:23 francis Exp $ require 'digest/sha1' @@ -65,20 +65,6 @@ class User < ActiveRecord::Base "user" end - # if the URL name has changed, then all requested_by: queries - # will break unless we update index for every event for every - # request linked to it - after_save :reindex_requested_by - def reindex_requested_by - if self.changes.include?('url_name') - for info_request in self.info_requests - for info_request_event in info_request.info_request_events - info_request_event.xapian_mark_needs_index - end - end - end - end - def after_initialize if self.admin_level.nil? self.admin_level = 'none' @@ -89,14 +75,17 @@ class User < ActiveRecord::Base after_save :reindex_referencing_models def reindex_referencing_models return if no_xapian_reindex == true - for comment in self.comments - for info_request_event in comment.info_request_events - info_request_event.xapian_mark_needs_index + + if self.changes.include?('url_name') + for comment in self.comments + for info_request_event in comment.info_request_events + info_request_event.xapian_mark_needs_index + end end - end - for info_request in self.info_requests - for info_request_event in info_request.info_request_events - info_request_event.xapian_mark_needs_index + for info_request in self.info_requests + for info_request_event in info_request.info_request_events + info_request_event.xapian_mark_needs_index + end end end end |