diff options
| author | David Cabo <david@calibea.com> | 2011-09-01 02:46:22 +0200 |
|---|---|---|
| committer | David Cabo <david@calibea.com> | 2011-09-01 02:46:22 +0200 |
| commit | 6a7c9cdd3c5bf3db7701ef1353f04527e96c8cc3 (patch) | |
| tree | 59cfc21e66fc3c44eb01991ef03f253dcaaf010d /app/models | |
| parent | 1fb99a4df2514cb6aea37fcf1fd4790234d77c7e (diff) | |
| parent | 88c26439d7d00cc5f0e1ddcb7b0a0036fa3f9c88 (diff) | |
Merge branch 'asktheeu-new-design' into develop (update New Request workflow to match new wireframes)
Diffstat (limited to 'app/models')
| -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 9b0f1047b..978e2cd08 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -780,8 +780,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' @@ -819,6 +818,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 4003217b0..4ea89bf81 100644 --- a/app/models/info_request_event.rb +++ b/app/models/info_request_event.rb @@ -303,37 +303,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" + return status.nil? ? _("Response") : InfoRequest.get_status_description(status) end if is_outgoing_message? |