Use lazy lookups for translations in issues
[rails.git] / app / controllers / reports_controller.rb
index 781c3af66b87021405710388ec7c92f8a2d6a4f8..95c9343e63685dea0d49ad21bccc29e9bc98a98b 100644 (file)
@@ -5,9 +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)
+    else
+      redirect_to root_path, :notice => t(".missing_params")
     end
   end
 
     end
   end
 
@@ -17,16 +19,19 @@ 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(".successful_report")
     else
     else
-      redirect_to new_report_path(:reportable_type => @report.issue.reportable_type, :reportable_id => @report.issue.reportable_id), :notice => t("issues.create.provide_details")
+      redirect_to new_report_path(:reportable_type => @report.issue.reportable_type, :reportable_id => @report.issue.reportable_id), :notice => t(".provide_details")
     end
   end
 
   private
 
     end
   end
 
   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 create_new_report_params
     params.permit(:reportable_id, :reportable_type)
   end