cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use rails 5 version of redirect_back.

Browse source
This commit is contained in:
Andy Allan 2017-07-12 13:57:09 +01:00
parent 9c1c696141
commit c1cdddf11f
1 changed files with 2 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/controllers/issues_controller.rb
View file

@ -103,7 +103,7 @@ class IssuesController < ApplicationController
Notifier.new_issue_notification(@issue.id, User.find(user.user_id)).deliver_now
end
redirect_back "/", :notice => t("issues.create.successful_report")
redirect_back :fallback_location => "/", :notice => t("issues.create.successful_report")
end
else
redirect_to new_issue_path(:reportable_type => @issue.reportable_type, :reportable_id => @issue.reportable_id), :notice => t("issues.create.provide_details")
@ -137,7 +137,7 @@ class IssuesController < ApplicationController
if @report.save!
@issue.report_count = @issue.reports.count
@issue.save!
redirect_back "/", :notice => notice
redirect_back :fallback_location => "/", :notice => notice
end
else
redirect_to new_issue_path(:reportable_type => @issue.reportable_type, :reportable_id => @issue.reportable_id), :notice => t("issues.update.provide_details")
@ -269,13 +269,4 @@ class IssuesController < ApplicationController
def sort_direction
%w[asc desc].include?(params[:direction]) ? params[:direction] : "asc"
end
# back-port of ActionController#redirect_back from rails 5
def redirect_back(fallback_location, **args)
if referer = request.headers["Referer"]
redirect_to referer, **args
else
redirect_to fallback_location, **args
end
end
end