X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e5604ce98e267cb0cec7dd27078a9e86c919eeb1..a18366903e7c150a1e8980bf7e46777f48ca4e39:/app/controllers/reports_controller.rb diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb index ef87a8699..5c70d9704 100644 --- a/app/controllers/reports_controller.rb +++ b/app/controllers/reports_controller.rb @@ -3,7 +3,11 @@ class ReportsController < ApplicationController before_action :authorize_web before_action :set_locale - before_action :require_user + before_action :check_database_readable + + authorize_resource + + before_action :check_database_writable, :only => [:new, :create] def new if required_new_report_params_present? @@ -27,7 +31,8 @@ class ReportsController < ApplicationController 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(".provide_details") + flash.now[:notice] = t(".provide_details") + render :action => "new" end end @@ -51,12 +56,15 @@ class ReportsController < ApplicationController def default_assigned_role case issue_params[:reportable_type] - when "Note" then "moderator" - when "User" then case report_params[:category] - when "vandal" then "moderator" - else "administrator" - end - else "administrator" + when "Note" + "moderator" + when "User" + case report_params[:category] + when "vandal" then "moderator" + else "administrator" + end + else + "administrator" end end end