X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e0faf6843746464d85a0cfbfc071226c2d62148d..32d1afbb18ebde7fe9b5be37315fd384dadd0d6b:/app/controllers/reports_controller.rb

diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
index b5740d146..8a1bed508 100644
--- a/app/controllers/reports_controller.rb
+++ b/app/controllers/reports_controller.rb
@@ -5,9 +5,11 @@ class ReportsController < ApplicationController
   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("reports.new.missing_params")
     end
   end
 
@@ -17,8 +19,8 @@ class ReportsController < ApplicationController
 
     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("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
@@ -26,6 +28,10 @@ class ReportsController < ApplicationController
 
   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