diff options
| -rw-r--r-- | app/models/info_request_event.rb | 10 | ||||
| -rw-r--r-- | app/views/request/_request_listing_via_event.rhtml | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/app/models/info_request_event.rb b/app/models/info_request_event.rb index 5edd614a9..5b176c1e5 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.28 2008-03-31 19:15:38 francis Exp $ +# $Id: info_request_event.rb,v 1.29 2008-03-31 22:41:34 francis Exp $ class InfoRequestEvent < ActiveRecord::Base belongs_to :info_request @@ -150,15 +150,15 @@ class InfoRequestEvent < ActiveRecord::Base if status == 'waiting_response' "Acknowledgement" elsif status == 'waiting_clarification' - "Clarification request" + "Clarification required" elsif status == 'not_held' "Information not held" elsif status == 'rejected' - "Rejection" + "Rejection by" elsif status == 'partially_successful' - "Partially successful response" + "Some information sent" elsif status == 'successful' - "Successful response" + "All information sent" elsif status == 'requires_admin' "Unusual response" else diff --git a/app/views/request/_request_listing_via_event.rhtml b/app/views/request/_request_listing_via_event.rhtml index 94e8b67bd..8e673a142 100644 --- a/app/views/request/_request_listing_via_event.rhtml +++ b/app/views/request/_request_listing_via_event.rhtml @@ -26,16 +26,16 @@ <span class="request_listing_bottomline"> <% if event.event_type == 'sent' %> - <strong>Request</strong> sent to <%= public_body_link(info_request.public_body) %> + Request sent to <%= public_body_link(info_request.public_body) %> by <%= user_link(info_request.user) %> <% elsif event.event_type == 'followup_sent' %> - <strong>Follow up</strong> sent to <%= public_body_link(info_request.public_body) %> + Sent to <%= public_body_link(info_request.public_body) %> by <%= user_link(info_request.user) %> <% elsif event.event_type == 'response' %> <% if event.calculated_state.nil? %> - <strong>Response</strong> + Response <% else %> - <strong> <%=event.display_status %> </strong> + <%=event.display_status %> <% end %> by <%= public_body_link(info_request.public_body) %> to <%= user_link(info_request.user) %> |