summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2013-11-15 20:32:26 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2013-11-15 20:32:26 +0000
commit071bb653b81c74a15fd3f1a8af44980a80308bc2 (patch)
treeb762e45e4d2dcc37552d12b196f372eb54f45783
parentd291012b2941f6b2b74ab76983f02f4fe580fdf7 (diff)
downloadredmine-071bb653b81c74a15fd3f1a8af44980a80308bc2.tar.gz
redmine-071bb653b81c74a15fd3f1a8af44980a80308bc2.zip
Merged r12277 (#15344).
git-svn-id: http://svn.redmine.org/redmine/branches/2.3-stable@12279 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/controllers/issues_controller.rb2
-rw-r--r--test/functional/issues_controller_test.rb10
2 files changed, 11 insertions, 1 deletions
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index fb1c5765f..71c9815a1 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -410,7 +410,7 @@ class IssuesController < ApplicationController
@issue.safe_attributes = params[:issue]
@priorities = IssuePriority.active
- @allowed_statuses = @issue.new_statuses_allowed_to(User.current, true)
+ @allowed_statuses = @issue.new_statuses_allowed_to(User.current, @issue.new_record?)
@available_watchers = (@issue.project.users.sort + @issue.watcher_users).uniq
end
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 59f7a858a..c5b17f8f7 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -2720,6 +2720,16 @@ class IssuesControllerTest < ActionController::TestCase
assert_equal 'This is the test_new issue', issue.subject
end
+ def test_update_form_should_propose_default_status_for_existing_issue
+ @request.session[:user_id] = 2
+ WorkflowTransition.delete_all
+ WorkflowTransition.create!(:role_id => 1, :tracker_id => 2, :old_status_id => 2, :new_status_id => 3)
+
+ xhr :put, :update_form, :project_id => 1, :id => 2
+ assert_response :success
+ assert_equal [2,3], assigns(:allowed_statuses).map(&:id).sort
+ end
+
def test_put_update_without_custom_fields_param
@request.session[:user_id] = 2
ActionMailer::Base.deliveries.clear