diff options
| author | Matthew Landauer <matthew@openaustralia.org> | 2013-03-03 12:37:08 +1100 |
|---|---|---|
| committer | Matthew Landauer <matthew@openaustralia.org> | 2013-03-03 12:37:08 +1100 |
| commit | f8c895f8eb93b2e818485085f232fe30a179805e (patch) | |
| tree | 06c9ee0caedc4c5d1dfbf2670fbe7c3d4254ce68 /app/controllers/request_controller.rb | |
| parent | d785bf7e0ad702116706672d964e228612d0b797 (diff) | |
Extract method that knows who can update the state of a request
Diffstat (limited to 'app/controllers/request_controller.rb')
| -rw-r--r-- | app/controllers/request_controller.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index 659537e80..984689ce1 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -507,10 +507,12 @@ class RequestController < ApplicationController def describe_state_requires_admin @info_request = InfoRequest.find_by_url_title!(params[:url_title]) - unless (authenticated_user && @info_request.is_old_unclassified?) || @info_request.is_owning_user?(authenticated_user) || authenticated_as_user?(@info_request.user, - :web => _("To classify the response to this FOI request"), - :email => _("Then you can classify the FOI response you have got from ") + @info_request.public_body.name + ".", - :email_subject => _("Classify an FOI response from ") + @info_request.public_body.name) + unless Ability::can_update_request_state?(authenticated_user, @info_request) + # If we got here this is always going to be false + authenticated_as_user?(@info_request.user, + :web => _("To classify the response to this FOI request"), + :email => _("Then you can classify the FOI response you have got from ") + @info_request.public_body.name + ".", + :email_subject => _("Classify an FOI response from ") + @info_request.public_body.name) return end |