aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/request_controller.rb
diff options
context:
space:
mode:
authorMatthew Landauer <matthew@openaustralia.org>2013-03-22 14:50:01 +1100
committerMatthew Landauer <matthew@openaustralia.org>2013-03-22 14:50:01 +1100
commit661ad52ef88de7afcbd7820d8283057764f4d1ac (patch)
treedcaebe1fd1020c10c74d55261e6312e49a2a2104 /app/controllers/request_controller.rb
parentadac483b0f8133c8d9623dba24b6c52f1cc0f8a9 (diff)
Only allow posts for reporting request. Don't try redirection when not logged in
Diffstat (limited to 'app/controllers/request_controller.rb')
-rw-r--r--app/controllers/request_controller.rb14
1 files changed, 5 insertions, 9 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb
index a018d76c9..e12c408ea 100644
--- a/app/controllers/request_controller.rb
+++ b/app/controllers/request_controller.rb
@@ -682,19 +682,15 @@ class RequestController < ApplicationController
def report_request
info_request = InfoRequest.find_by_url_title!(params[:url_title])
- return if !authenticated?(
- :web => _("To report this FOI request"),
- :email => _("Then you can report the request '{{title}}'", :title => info_request.title),
- :email_subject => _("Report an offensive or unsuitable request")
- )
-
- if !info_request.attention_requested
+ if !authenticated_user
+ flash[:notice] = _("You need to be logged in to report a request for administrator attention")
+ elsif info_request.attention_requested
+ flash[:notice] = _("This request has already been reported for administrator attention")
+ else
info_request.set_described_state('attention_requested', @user, "Reason: #{params[:reason]}\n\n#{params[:message]}")
info_request.attention_requested = true # tells us if attention has ever been requested
info_request.save!
flash[:notice] = _("This request has been reported for administrator attention")
- else
- flash[:notice] = _("This request has already been reported for administrator attention")
end
redirect_to request_url(info_request)
end