Merge remote-tracking branch 'upstream/pull/5408'

[rails.git] / app / controllers / reports_controller.rb

diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
index 30cb9da7cc18c526ab9b93eabbb338cf72fbf2a8..5c70d970408f595411fd70c097c8c389ddd7e933 100644 (file)
--- a/app/controllers/reports_controller.rb
+++ b/app/controllers/reports_controller.rb
@@ -3,9 +3,12 @@ class ReportsController < ApplicationController
 
   before_action :authorize_web
   before_action :set_locale
 
   before_action :authorize_web
   before_action :set_locale

+  before_action :check_database_readable

 
   authorize_resource
 
 
   authorize_resource
 

+  before_action :check_database_writable, :only => [:new, :create]
+

   def new
     if required_new_report_params_present?
       @report = Report.new
   def new
     if required_new_report_params_present?
       @report = Report.new


@@ -28,7 +31,7 @@ class ReportsController < ApplicationController
 
       redirect_to helpers.reportable_url(@report.issue.reportable), :notice => t(".successful_report")
     else
 
       redirect_to helpers.reportable_url(@report.issue.reportable), :notice => t(".successful_report")
     else

-      flash[:notice] = t(".provide_details")
+      flash.now[:notice] = t(".provide_details")

       render :action => "new"
     end
   end
       render :action => "new"
     end
   end