Set the locale for issue and report views

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

diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
index b5740d146bf9557e390465026d8615b79a425445..08092c073c7de0b14938edafc6c28f445f457c18 100644 (file)
--- a/app/controllers/reports_controller.rb
+++ b/app/controllers/reports_controller.rb
@@ -2,12 +2,15 @@ class ReportsController < ApplicationController
   layout "site"
 
   before_action :authorize_web
   layout "site"
 
   before_action :authorize_web

+  before_action :set_locale

   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,15 +20,19 @@ class ReportsController < ApplicationController
 
     if @report.save
       @report.issue.save
 
     if @report.save
       @report.issue.save

-      # FIXME: reopen issue if necessary
-      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