Merge branch 'feature/hide-individual-responses' into rails-3-develop

Conflicts:
    Gemfile
    app/views/admin_request/edit_outgoing.html.erb
    config/packages
    doc/CHANGES.md
    doc/INSTALL.md
    spec/models/info_request_spec.rb
    spec/models/public_body_spec.rb

1 files changed, 12 insertions, 1 deletions

diff --git a/lib/ability.rb b/lib/ability.rb
index 2865ccb1c..f63845e84 100644
--- a/lib/ability.rb
+++ b/lib/ability.rb
@@ -2,4 +2,15 @@ module Ability
   def self.can_update_request_state?(user, request)
     (user && request.is_old_unclassified?) || request.is_owning_user?(user)
   end
-end
\ No newline at end of file
+
+  def self.can_view_with_prominence?(prominence, info_request, user)
+      if prominence == 'hidden'
+          return User.view_hidden?(user)
+      end
+      if prominence == 'requester_only'
+          return info_request.is_owning_user?(user)
+      end
+      return true
+  end
+
+end