X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3a386f185c954d71a9b5d0747d017f99c8ccb6ff..5ea1ba8d8427d75aef4bd91ef79891ee0b86de28:/app/controllers/reports_controller.rb

diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
index 5d0442731..08092c073 100644
--- 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
+  before_action :set_locale
   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)
+    else
+      redirect_to root_path, :notice => t(".missing_params")
     end
   end
 
@@ -18,14 +21,18 @@ class ReportsController < ApplicationController
     if @report.save
       @report.issue.save
       @report.issue.reopen! unless @report.issue.open?
-      redirect_to root_path, :notice => t("issues.create.successful_report")
+      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("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
 
+  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