Avoid sending a commit value from from the search button

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

diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
index 6c62deb30d677db8ae6ac55850c11900685fe996..8a1bed50848785510dadb6e902e0441430ef7caf 100644 (file)
--- a/app/controllers/reports_controller.rb
+++ b/app/controllers/reports_controller.rb
@@ -5,11 +5,11 @@ class ReportsController < ApplicationController
   before_action :require_user
 
   def new
   before_action :require_user
 
   def new

-    if create_new_report_params.present?
+    if required_new_report_params_present?

       @report = Report.new
       @report.issue = Issue.find_or_initialize_by(create_new_report_params)
       @report = Report.new
       @report.issue = Issue.find_or_initialize_by(create_new_report_params)

-      path = "issues.report_strings." + @report.issue.reportable.class.name.to_s
-      @report_strings_yaml = t(path)
+    else
+      redirect_to root_path, :notice => t("reports.new.missing_params")

     end
   end
 
     end
   end
 


@@ -19,9 +19,8 @@ class ReportsController < ApplicationController
 
     if @report.save
       @report.issue.save
 
     if @report.save
       @report.issue.save

-      # FIXME: reopen issue if necessary
-      # FIXME: new issue notification (or via model observer)
-      redirect_to root_path, :notice => t("issues.create.successful_report")
+      @report.issue.reopen! unless @report.issue.open?
+      redirect_to helpers.reportable_url(@report.issue.reportable), :notice => t("issues.create.successful_report")

     else
       redirect_to new_report_path(:reportable_type => @report.issue.reportable_type, :reportable_id => @report.issue.reportable_id), :notice => t("issues.create.provide_details")
     end
     else
       redirect_to new_report_path(:reportable_type => @report.issue.reportable_type, :reportable_id => @report.issue.reportable_id), :notice => t("issues.create.provide_details")
     end


@@ -29,11 +28,15 @@ class ReportsController < ApplicationController
 
   private
 
 
   private
 

+  def required_new_report_params_present?
+    create_new_report_params["reportable_id"].present? && create_new_report_params["reportable_type"].present?
+  end
+

   def create_new_report_params
     params.permit(:reportable_id, :reportable_type)
   end
 
   def report_params
   def create_new_report_params
     params.permit(:reportable_id, :reportable_type)
   end
 
   def report_params

-    params[:report].permit(:details)
+    params[:report].permit(:details, :category)

   end
 end
   end
 end