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/info_request.rb | |
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/info_request.rb')
-rw-r--r-- | app/models/info_request.rb | 7 |
1 files changed, 5 insertions, 2 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| |