diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/reports_controller.rb | 16 | ||||
| -rw-r--r-- | app/views/reports/new.html.erb | 4 |
2 files changed, 14 insertions, 6 deletions
diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb index 924eb0108..a1dd53125 100644 --- a/app/controllers/reports_controller.rb +++ b/app/controllers/reports_controller.rb @@ -1,15 +1,23 @@ class ReportsController < ApplicationController def create - info_request = InfoRequest.find_by_url_title!(params[:request_id]) + @info_request = InfoRequest.find_by_url_title!(params[:request_id]) + @reason = params[:reason] + @message = params[:message] + if @reason.empty? + flash[:error] = _("Please choose a reason") + render "new" + return + end + if !authenticated_user flash[:notice] = _("You need to be logged in to report a request for administrator attention") - elsif info_request.attention_requested + elsif @info_request.attention_requested flash[:notice] = _("This request has already been reported for administrator attention") else - info_request.report!(params[:reason], params[:message], @user) + @info_request.report!(@reason, @message, @user) flash[:notice] = _("This request has been reported for administrator attention") end - redirect_to request_url(info_request) + redirect_to request_url(@info_request) end def new diff --git a/app/views/reports/new.html.erb b/app/views/reports/new.html.erb index b5ca1421f..7d558ab4e 100644 --- a/app/views/reports/new.html.erb +++ b/app/views/reports/new.html.erb @@ -11,11 +11,11 @@ <%= form_tag request_report_path(:request_id => @info_request.url_title) do %> <p> <label class="form_label" for="reason">Reason:</label> - <%= select_tag :reason, options_for_select(@info_request.report_reasons), :prompt => "Choose a reason" %> + <%= select_tag :reason, options_for_select(@info_request.report_reasons, @reason), :prompt => "Choose a reason" %> </p> <p> <label class="form_label" for="message">Please tell us more:</label> - <%= text_area_tag :message, "", :rows => 10, :cols => 60 %> + <%= text_area_tag :message, @message, :rows => 10, :cols => 60 %> </p> <div class="form_button"> |