aboutsummaryrefslogtreecommitdiffstats
path: root/app/models
diff options
context:
space:
mode:
Diffstat (limited to 'app/models')
-rw-r--r--app/models/info_request.rb6
-rw-r--r--app/models/info_request_event.rb2
-rw-r--r--app/models/track_thing.rb2
3 files changed, 5 insertions, 5 deletions
diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index da953f231..f6eec0601 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -56,7 +56,7 @@ class InfoRequest < ActiveRecord::Base
'waiting_clarification',
'gone_postal',
'not_held',
- 'rejected',
+ 'rejected', # this is called 'refused' in UK FOI law and the user interface, but 'rejected' internally for historic reasons
'successful',
'partially_successful',
'internal_review',
@@ -83,7 +83,7 @@ class InfoRequest < ActiveRecord::Base
'authority_only', # only people from authority domains
'nobody'
]
- # what to do with rejected new responses
+ # what to do with refused new responses
validates_inclusion_of :handle_rejected_responses, :in => [
'bounce', # return them to sender
'holding_pen', # put them in the holding pen
@@ -744,7 +744,7 @@ public
elsif status == 'not_held'
"Information not held."
elsif status == 'rejected'
- "Rejected."
+ "Refused."
elsif status == 'partially_successful'
"Partially successful."
elsif status == 'successful'
diff --git a/app/models/info_request_event.rb b/app/models/info_request_event.rb
index 4e2a10a1f..1422431dc 100644
--- a/app/models/info_request_event.rb
+++ b/app/models/info_request_event.rb
@@ -282,7 +282,7 @@ class InfoRequestEvent < ActiveRecord::Base
elsif status == 'not_held'
return "Information not held"
elsif status == 'rejected'
- return "Rejection"
+ return "Refused"
elsif status == 'partially_successful'
return "Some information sent"
elsif status == 'successful'
diff --git a/app/models/track_thing.rb b/app/models/track_thing.rb
index 3392a4210..c2036118f 100644
--- a/app/models/track_thing.rb
+++ b/app/models/track_thing.rb
@@ -215,7 +215,7 @@ class TrackThing < ActiveRecord::Base
# RSS sorting - XXX hmmm, we don't really know which to use
# here for sorting. Might be a query term (e.g. 'cctv'), in
# which case newest is good, or might be something like
- # all rejected requests in which case want to sort by
+ # all refused requests in which case want to sort by
# described (when we discover criteria is met). Rather
# conservatively am picking described, as that will make
# things appear in feed more than the should, rather than less.