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

                  assert_equal 'This is the test_new issue', issue.subject
                end
+               def test_update_new_form_should_propose_transitions_based_on_initial_status
+                 @request.session[:user_id] = 2
+                 Workflow.delete_all
+                 Workflow.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 1, :new_status_id => 2)
+                 Workflow.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 1, :new_status_id => 5)
+                 Workflow.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 5, :new_status_id => 4)
+                 xhr :post, :new, :project_id => 1,
+                                  :issue => {:tracker_id => 1,
+                                             :status_id => 5,
+                                             :subject => 'This is an issue'}
+                 assert_equal 5, assigns(:issue).status_id
+                 assert_equal [1,2,5], assigns(:allowed_statuses).map(&:id).sort
+               end
                def test_post_create
                  @request.session[:user_id] = 2
                  assert_difference 'Issue.count' do
                  assert_equal 'This is the test_new issue', issue.subject
                end
+               def test_update_edit_form_should_propose_transitions_based_on_initial_status
+                 @request.session[:user_id] = 2
+                 Workflow.delete_all
+                 Workflow.create!(:role_id => 1, :tracker_id => 2, :old_status_id => 2, :new_status_id => 1)
+                 Workflow.create!(:role_id => 1, :tracker_id => 2, :old_status_id => 2, :new_status_id => 5)
+                 Workflow.create!(:role_id => 1, :tracker_id => 2, :old_status_id => 5, :new_status_id => 4)
+                 xhr :put, :new, :project_id => 1,
+                                 :id => 2,
+                                 :issue => {:tracker_id => 2,
+                                            :status_id => 5,
+                                            :subject => 'This is an issue'}
+                 assert_equal 5, assigns(:issue).status_id
+                 assert_equal [1,2,5], assigns(:allowed_statuses).map(&:id).sort
+               end
                def test_update_edit_form_with_project_change
                  @request.session[:user_id] = 2
                  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