diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/incoming_message.rb | 8 | ||||
| -rw-r--r-- | app/models/info_request.rb | 8 |
2 files changed, 2 insertions, 14 deletions
diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb index 6e85f86f0..398289c28 100644 --- a/app/models/incoming_message.rb +++ b/app/models/incoming_message.rb @@ -72,13 +72,7 @@ class IncomingMessage < ActiveRecord::Base end def user_can_view?(user) - if self.prominence == 'hidden' - return User.view_hidden?(user) - end - if self.prominence == 'requester_only' - return self.info_request.is_owning_user?(user) - end - return true + Ability.can_view_with_prominence?(self.prominence, self.info_request, user) end # Return a cached structured mail object diff --git a/app/models/info_request.rb b/app/models/info_request.rb index ad210c6fc..8c8a23066 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -1018,13 +1018,7 @@ public end def user_can_view?(user) - if self.prominence == 'hidden' - return User.view_hidden?(user) - end - if self.prominence == 'requester_only' - return self.is_owning_user?(user) - end - return true + Ability.can_view_with_prominence?(self.prominence, self, user) end # Is this request visible to everyone? |