summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Davis <edavis@littlestreamsoftware.com>2010-09-20 04:05:38 +0000
committerEric Davis <edavis@littlestreamsoftware.com>2010-09-20 04:05:38 +0000
commit066f648949c6441543a4fdb74995f1ad4f7dadba (patch)
treeb96d8d9cddd5b6b7e1da7d44fcbc87975b41b475
parent46fc8783966866700a0146de9e74ff1e900e4aca (diff)
downloadredmine-066f648949c6441543a4fdb74995f1ad4f7dadba.tar.gz
redmine-066f648949c6441543a4fdb74995f1ad4f7dadba.zip
Merged r4083 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4144 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/controllers/issues_controller.rb2
-rw-r--r--test/functional/issues_controller_test.rb3
2 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 0364e307c..928badd17 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -133,7 +133,7 @@ class IssuesController < ApplicationController
call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue})
respond_to do |format|
format.html {
- redirect_to(params[:continue] ? { :action => 'new', :issue => {:tracker_id => @issue.tracker, :parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?} } :
+ redirect_to(params[:continue] ? { :action => 'new', :project_id => @project, :issue => {:tracker_id => @issue.tracker, :parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?} } :
{ :action => 'show', :id => @issue })
}
format.xml { render :action => 'show', :status => :created, :location => url_for(:controller => 'issues', :action => 'show', :id => @issue) }
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 7d69db8ea..9e70233b2 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -405,7 +405,8 @@ class IssuesControllerTest < ActionController::TestCase
:subject => 'This is first issue',
:priority_id => 5},
:continue => ''
- assert_redirected_to :controller => 'issues', :action => 'new', :issue => {:tracker_id => 3}
+ assert_redirected_to :controller => 'issues', :action => 'new', :project_id => 'ecookbook',
+ :issue => {:tracker_id => 3}
end
def test_post_create_without_custom_fields_param