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

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

diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
index 95c9343e63685dea0d49ad21bccc29e9bc98a98b..5c70d970408f595411fd70c097c8c389ddd7e933 100644 (file)
--- a/app/controllers/reports_controller.rb
+++ b/app/controllers/reports_controller.rb
@@ -2,7 +2,12 @@ class ReportsController < ApplicationController
   layout "site"
 
   before_action :authorize_web
   layout "site"
 
   before_action :authorize_web

-  before_action :require_user
+  before_action :set_locale
+  before_action :check_database_readable
+
+  authorize_resource
+
+  before_action :check_database_writable, :only => [:new, :create]

 
   def new
     if required_new_report_params_present?
 
   def new
     if required_new_report_params_present?


@@ -15,14 +20,19 @@ class ReportsController < ApplicationController
 
   def create
     @report = current_user.reports.new(report_params)
 
   def create
     @report = current_user.reports.new(report_params)

-    @report.issue = Issue.find_or_initialize_by(:reportable_id => params[:report][:issue][:reportable_id], :reportable_type => params[:report][:issue][:reportable_type])
+    @report.issue = Issue
+                    .create_with(:assigned_role => default_assigned_role)
+                    .find_or_initialize_by(issue_params)

 
     if @report.save
 
     if @report.save

-      @report.issue.save
-      @report.issue.reopen! unless @report.issue.open?
+      @report.issue.assigned_role = "administrator" if default_assigned_role == "administrator"
+      @report.issue.reopen unless @report.issue.open?
+      @report.issue.save!
+

       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

-      redirect_to new_report_path(:reportable_type => @report.issue.reportable_type, :reportable_id => @report.issue.reportable_id), :notice => t(".provide_details")
+      flash.now[:notice] = t(".provide_details")
+      render :action => "new"

     end
   end
 
     end
   end
 


@@ -37,6 +47,24 @@ class ReportsController < ApplicationController
   end
 
   def report_params
   end
 
   def report_params

-    params[:report].permit(:details, :category)
+    params.require(:report).permit(:details, :category)
+  end
+
+  def issue_params
+    params.require(:report).require(:issue).permit(:reportable_id, :reportable_type)
+  end
+
+  def default_assigned_role
+    case issue_params[:reportable_type]
+    when "Note"
+      "moderator"
+    when "User"
+      case report_params[:category]
+      when "vandal" then "moderator"
+      else "administrator"
+      end
+    else
+      "administrator"
+    end

   end
 end
   end
 end