jro_apps/redmine Commit - r9265:1feb373c8903

Merged r9378 from trunk....

Jean-Philippe Lang -

r9265:1feb373c8903

parent child

Context file:

r9265:1feb373c8903

Collapse all files

app/controllers/issues_controller.rb +2 -2

               # from the params
               # TODO: Refactor, not everything in here is needed by #edit
               def update_issue_from_params
-                @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
-                @priorities = IssuePriority.active
                 @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
                 @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
                 @time_entry.attributes = params[:time_entry]
                   end
                 end
                 @issue.safe_attributes = issue_attributes
+                @priorities = IssuePriority.active
+                @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
                 true
               end

app/models/issue.rb +12 -4

                 !relations_to.detect {|ir| ir.relation_type == 'blocks' && !ir.issue_from.closed?}.nil?
               end
-              # Returns an array of status that user is able to apply
+              # Returns an array of statuses that user is able to apply
               def new_statuses_allowed_to(user=User.current, include_default=false)
-                statuses = status.find_new_statuses_allowed_to(
+                initial_status = nil
+                if new_record?
+                  initial_status = IssueStatus.default
+                elsif status_id_was
+                  initial_status = IssueStatus.find_by_id(status_id_was)
+                end
+                initial_status ||= status
+                statuses = initial_status.find_new_statuses_allowed_to(
                   user.admin ? Role.all : user.roles_for_project(project),
                   tracker,
                   author == user,
                   assigned_to_id_changed? ? assigned_to_id_was == user.id : assigned_to_id == user.id
                   )
-                statuses << status unless statuses.empty?
+                statuses << initial_status unless statuses.empty?
                 statuses << IssueStatus.default if include_default
-                statuses = statuses.uniq.sort
+                statuses = statuses.compact.uniq.sort
                 blocked? ? statuses.reject {|s| s.is_closed?} : statuses
               end

test/functional/issues_controller_test.rb +33 0

@@ -1372,6 +1372,22 class IssuesControllerTest < ActionController::TestCase
1372	assert_equal 'This is the test_new issue', issue.subject	1372	assert_equal 'This is the test_new issue', issue.subject
1373	end	1373	end
1374		1374
		1375	def test_update_new_form_should_propose_transitions_based_on_initial_status
		1376	@request.session[:user_id] = 2
		1377	Workflow.delete_all
		1378	Workflow.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 1, :new_status_id => 2)
		1379	Workflow.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 1, :new_status_id => 5)
		1380	Workflow.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 5, :new_status_id => 4)
		1381
		1382	xhr :post, :new, :project_id => 1,
		1383	:issue => {:tracker_id => 1,
		1384	:status_id => 5,
		1385	:subject => 'This is an issue'}
		1386
		1387	assert_equal 5, assigns(:issue).status_id
		1388	assert_equal [1,2,5], assigns(:allowed_statuses).map(&:id).sort
		1389	end
		1390
1375	def test_post_create	1391	def test_post_create
1376	@request.session[:user_id] = 2	1392	@request.session[:user_id] = 2
1377	assert_difference 'Issue.count' do	1393	assert_difference 'Issue.count' do
@@ -2180,6 +2196,23 class IssuesControllerTest < ActionController::TestCase
2180	assert_equal 'This is the test_new issue', issue.subject	2196	assert_equal 'This is the test_new issue', issue.subject
2181	end	2197	end
2182		2198
		2199	def test_update_edit_form_should_propose_transitions_based_on_initial_status
		2200	@request.session[:user_id] = 2
		2201	Workflow.delete_all
		2202	Workflow.create!(:role_id => 1, :tracker_id => 2, :old_status_id => 2, :new_status_id => 1)
		2203	Workflow.create!(:role_id => 1, :tracker_id => 2, :old_status_id => 2, :new_status_id => 5)
		2204	Workflow.create!(:role_id => 1, :tracker_id => 2, :old_status_id => 5, :new_status_id => 4)
		2205
		2206	xhr :put, :new, :project_id => 1,
		2207	:id => 2,
		2208	:issue => {:tracker_id => 2,
		2209	:status_id => 5,
		2210	:subject => 'This is an issue'}
		2211
		2212	assert_equal 5, assigns(:issue).status_id
		2213	assert_equal [1,2,5], assigns(:allowed_statuses).map(&:id).sort
		2214	end
		2215
2183	def test_update_edit_form_with_project_change	2216	def test_update_edit_form_with_project_change
2184	@request.session[:user_id] = 2	2217	@request.session[:user_id] = 2
2185	xhr :put, :new, :project_id => 1,	2218	xhr :put, :new, :project_id => 1,

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages