diff options
| author | Eric Davis <edavis@littlestreamsoftware.com> | 2010-08-19 04:30:53 +0000 |
|---|---|---|
| committer | Eric Davis <edavis@littlestreamsoftware.com> | 2010-08-19 04:30:53 +0000 |
| commit | 19bbb6e2cb2367f0f5182d0ea8b7e01f87f76d83 (patch) | |
| tree | d98f875eb149c11cad608d87764e4f8af0ef4bf7 | |
| parent | b02463184a1fca124fc2aab42e1704939d5c21b2 (diff) | |
| download | redmine-19bbb6e2cb2367f0f5182d0ea8b7e01f87f76d83.tar.gz redmine-19bbb6e2cb2367f0f5182d0ea8b7e01f87f76d83.zip | |
Merged r3912 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3962 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/controllers/application_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/issues_controller.rb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 6e5634dbc..c00b6ba42 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -218,6 +218,10 @@ class ApplicationController < ActionController::Base end end + def back_url + params[:back_url] || request.env['HTTP_REFERER'] + end + def redirect_back_or_default(default) back_url = CGI.unescape(params[:back_url].to_s) if !back_url.blank? diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 8b5d73fa3..d73dfebfe 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -349,7 +349,7 @@ class IssuesController < ApplicationController @priorities = IssuePriority.all.reverse @statuses = IssueStatus.find(:all, :order => 'position') - @back = params[:back_url] || request.env['HTTP_REFERER'] + @back = back_url render :layout => false end |