X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d7612f42d04727c037deb3ef66ac421ea347d54b..7441f15b4fd59735ae00a16b47cfcf7eb99260a6:/app/controllers/reports_controller.rb

diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
index 6c62deb30..95c9343e6 100644
--- 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
-    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)
-      path = "issues.report_strings." + @report.issue.reportable.class.name.to_s
-      @report_strings_yaml = t(path)
+    else
+      redirect_to root_path, :notice => t(".missing_params")
     end
   end
 
@@ -19,21 +19,24 @@ class ReportsController < ApplicationController
 
     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
-      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
 
   def report_params
-    params[:report].permit(:details)
+    params[:report].permit(:details, :category)
   end
 end