diff options
| author | francis <francis> | 2008-03-31 23:58:53 +0000 |
|---|---|---|
| committer | francis <francis> | 2008-03-31 23:58:53 +0000 |
| commit | 3648650e974594a85c9558b81ab79fdc832b5c2f (patch) | |
| tree | 970e62b30f0235fd1179aa3c5d45dc952f1806d0 | |
| parent | 61aaeaf6c46920c9362a416f16283d06d16e8ceb (diff) | |
Make requested_by and requested_from apply to all event types
| -rw-r--r-- | app/models/info_request_event.rb | 14 | ||||
| -rw-r--r-- | todo.txt | 1 |
2 files changed, 3 insertions, 12 deletions
diff --git a/app/models/info_request_event.rb b/app/models/info_request_event.rb index d1798511b..40f880b72 100644 --- a/app/models/info_request_event.rb +++ b/app/models/info_request_event.rb @@ -17,7 +17,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.30 2008-03-31 23:19:16 francis Exp $ +# $Id: info_request_event.rb,v 1.31 2008-03-31 23:58:54 francis Exp $ class InfoRequestEvent < ActiveRecord::Base belongs_to :info_request @@ -63,18 +63,10 @@ class InfoRequestEvent < ActiveRecord::Base self.calculated_state end def requested_by - if self.event_type == 'sent' - self.info_request.user.url_name - else - nil - end + self.info_request.user.url_name end def requested_from - if self.event_type == 'sent' - self.info_request.public_body.url_name - else - nil - end + self.info_request.public_body.url_name end def solr_text_main text = '' @@ -1,7 +1,6 @@ Search: Make /list be search -Make requested_by field in responses as well FOI requests to use to test it ============================== |