aboutsummaryrefslogtreecommitdiffstats
path: root/app/models/info_request.rb
diff options
context:
space:
mode:
authorSeb Bacon <seb.bacon@gmail.com>2012-05-28 14:45:30 +0100
committerSeb Bacon <seb.bacon@gmail.com>2012-05-28 14:45:30 +0100
commite319d6c89acfad45f443a1a66c2b1bcf2672731c (patch)
tree81fa3f7cd88759e19fb7306698b674a8aace0c1b /app/models/info_request.rb
parentc81ab0b1982107f1c5e4793e6e903975c867b928 (diff)
parent084cc18aa872b3cd1cbc8c38d34dc17341472391 (diff)
Merge branch 'feature/easy-request-hiding-for-admin' into develop
Diffstat (limited to 'app/models/info_request.rb')
-rw-r--r--app/models/info_request.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index 726383ad7..095a1b1af 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -90,7 +90,9 @@ class InfoRequest < ActiveRecord::Base
'error_message',
'requires_admin',
'user_withdrawn',
- 'attention_requested'
+ 'attention_requested',
+ 'vexatious',
+ 'not_foi'
]
if @@custom_states_loaded
states += InfoRequest.theme_extra_states
@@ -816,6 +818,10 @@ public
_("Reported for administrator attention.")
elsif status == 'user_withdrawn'
_("Withdrawn by the requester.")
+ elsif status == 'vexatious'
+ _("Considered by administrators as vexatious and hidden from site.")
+ elsif status == 'not_foi'
+ _("Considered by administrators as not an FOI request and hidden from site.")
else
begin
return self.theme_display_status(status)