diff options
| -rw-r--r-- | app/models/info_request.rb | 7 | ||||
| -rw-r--r-- | app/models/info_request_event.rb | 32 |
2 files changed, 6 insertions, 33 deletions
diff --git a/app/models/info_request.rb b/app/models/info_request.rb index c667e1499..67ebd01b0 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -779,8 +779,7 @@ public # Display version of status - def display_status - status = self.calculate_status + def InfoRequest.get_status_description(status) if status == 'waiting_classification' _("Awaiting classification.") elsif status == 'waiting_response' @@ -818,6 +817,10 @@ public end end + def display_status + InfoRequest.get_status_description(self.calculate_status) + end + # Completely delete this request and all objects depending on it def fully_destroy self.track_things.each do |track_thing| diff --git a/app/models/info_request_event.rb b/app/models/info_request_event.rb index 1550a4bf5..c647884e2 100644 --- a/app/models/info_request_event.rb +++ b/app/models/info_request_event.rb @@ -279,37 +279,7 @@ class InfoRequestEvent < ActiveRecord::Base def display_status if is_incoming_message? status = self.calculated_state - if !status.nil? - if status == 'waiting_response' - return _("Acknowledgement") - elsif status == 'waiting_clarification' - return _("Clarification required") - elsif status == 'gone_postal' - return _("Handled by post") - elsif status == 'deadline_extended' - return _("Deadline Extended") - elsif status == 'wrong_response' - return _("Wrong Response") - elsif status == 'not_held' - return _("Information not held") - elsif status == 'rejected' - return _("Refused") - elsif status == 'partially_successful' - return _("Some information sent") - elsif status == 'successful' - return _("All information sent") - elsif status == 'internal_review' - return _("Internal review acknowledgement") - elsif status == 'user_withdrawn' - return _("Withdrawn by requester") - elsif status == 'error_message' - return _("Delivery error") - elsif status == 'requires_admin' - return _("Unusual response") - end - raise "unknown status " + status - end - return "Response" + status.nil? ? _("Response") : InfoRequest.get_status_description(status) end if is_outgoing_message? |