diff options
| author | francis <francis> | 2008-04-29 16:23:31 +0000 |
|---|---|---|
| committer | francis <francis> | 2008-04-29 16:23:31 +0000 |
| commit | d141de491ae38c24e34fbd094af4d151c20e3eab (patch) | |
| tree | 2c55371bf088305bf261b58bfaeffde1558560d0 | |
| parent | 5ce8e47b0142adfc89572ac7de4cf19fef997892 (diff) | |
Update calculated even status when new events are described (used to be done in
Solr indexing, better done here now anyway)
Fix bug where it wasn't passing latest statest change through
| -rw-r--r-- | app/models/info_request.rb | 6 | ||||
| -rw-r--r-- | app/models/info_request_event.rb | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 22ef40883..97bb2e927 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -21,7 +21,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: info_request.rb,v 1.96 2008-04-24 23:52:59 francis Exp $ +# $Id: info_request.rb,v 1.97 2008-04-29 16:23:31 francis Exp $ require 'digest/sha1' require 'vendor/plugins/acts_as_xapian/lib/acts_as_xapian' @@ -184,6 +184,8 @@ public self.save! end + self.calculate_event_states + if new_state == 'requires_admin' RequestMailer.deliver_requires_admin(self) end @@ -223,7 +225,7 @@ public def calculate_event_states curr_state = nil for event in self.info_request_events.reverse - if not event.described_state.nil? + if not event.described_state.nil? and curr_state.nil? curr_state = event.described_state end diff --git a/app/models/info_request_event.rb b/app/models/info_request_event.rb index a89e98cad..6b4de75ab 100644 --- a/app/models/info_request_event.rb +++ b/app/models/info_request_event.rb @@ -20,7 +20,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: info_request_event.rb,v 1.40 2008-04-24 23:52:59 francis Exp $ +# $Id: info_request_event.rb,v 1.41 2008-04-29 16:23:31 francis Exp $ class InfoRequestEvent < ActiveRecord::Base belongs_to :info_request @@ -185,7 +185,6 @@ class InfoRequestEvent < ActiveRecord::Base raise "unknown status " + status end end - end |