diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/info_request.rb | 6 | ||||
| -rw-r--r-- | app/models/user.rb | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/models/info_request.rb b/app/models/info_request.rb index c9bcc9bab..ad210c6fc 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -1019,7 +1019,7 @@ public def user_can_view?(user) if self.prominence == 'hidden' - return User.view_hidden_requests?(user) + return User.view_hidden?(user) end if self.prominence == 'requester_only' return self.is_owning_user?(user) @@ -1106,10 +1106,10 @@ public begin if self.described_state.nil? self.described_state = 'waiting_response' - end + end rescue ActiveModel::MissingAttributeError # this should only happen on Model.exists?() call. It can be safely ignored. - # See http://www.tatvartha.com/2011/03/activerecordmissingattributeerror-missing-attribute-a-bug-or-a-features/ + # See http://www.tatvartha.com/2011/03/activerecordmissingattributeerror-missing-attribute-a-bug-or-a-features/ end # FOI or EIR? if !self.public_body.nil? && self.public_body.eir_only? diff --git a/app/models/user.rb b/app/models/user.rb index 23d5f7f24..d7c1c854e 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -244,8 +244,8 @@ class User < ActiveRecord::Base !user.nil? && user.owns_every_request? end - # Can the user see every request, even hidden ones? - def User.view_hidden_requests?(user) + # Can the user see every request, response, and outgoing message, even hidden ones? + def User.view_hidden?(user) !user.nil? && user.super? end |