Merge branch 'master' into moderation

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

diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
index 6c62deb30d677db8ae6ac55850c11900685fe996..5d0442731733453d845790cc362ac8d9b2bfe15e 100644 (file)
--- a/app/controllers/reports_controller.rb
+++ b/app/controllers/reports_controller.rb
@@ -8,8 +8,6 @@ class ReportsController < ApplicationController
     if create_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)
     end
   end
 
@@ -19,8 +17,7 @@ class ReportsController < ApplicationController
 
     if @report.save
       @report.issue.save
-      # FIXME: reopen issue if necessary
-      # FIXME: new issue notification (or via model observer)
+      @report.issue.reopen! unless @report.issue.open?
       redirect_to root_path, :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")
@@ -34,6 +31,6 @@ class ReportsController < ApplicationController
   end
 
   def report_params
-    params[:report].permit(:details)
+    params[:report].permit(:details, :category)
   end
 end