jro_apps/redmine Commit - r11826:474453d2b0af

Additional status transitions for assignees do not work if assigned to a group (#14447)....

Jean-Philippe Lang -

r11826:474453d2b0af

parent child

Context file:

r11826:474453d2b0af

Collapse all files

app/models/issue.rb +6 -2

                      initial_status = IssueStatus.find_by_id(status_id_was)
                    end
                    initial_status ||= status
+                   initial_assigned_to_id = assigned_to_id_changed? ? assigned_to_id_was : assigned_to_id
+                   assignee_transitions_allowed = initial_assigned_to_id.present? &&
+                     (user.id == initial_assigned_to_id || user.group_ids.include?(initial_assigned_to_id))
                    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
+                     assignee_transitions_allowed
                      )
                    statuses << initial_status unless statuses.empty?
                    statuses << IssueStatus.default if include_default

test/unit/issue_test.rb +23 -3

                  WorkflowTransition.create!(:role_id => 1, :tracker_id => 1,
                                             :old_status_id => 1, :new_status_id => 3,
                                             :author => true, :assignee => false)
-                 WorkflowTransition.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 1,
-                                            :new_status_id => 4, :author => false,
-                                            :assignee => true)
+                 WorkflowTransition.create!(:role_id => 1, :tracker_id => 1,
+                                            :old_status_id => 1, :new_status_id => 4,
+                                            :author => false, :assignee => true)
                  WorkflowTransition.create!(:role_id => 1, :tracker_id => 1,
                                             :old_status_id => 1, :new_status_id => 5,
                                             :author => true, :assignee => true)
                                          :project_id => 1, :author => user,
                                          :assigned_to => user)
                  assert_equal [1, 2, 3, 4, 5], issue.new_statuses_allowed_to(user).map(&:id)
+                 group = Group.generate!
+                 group.users << user
+                 issue = Issue.generate!(:tracker => tracker, :status => status,
+                                         :project_id => 1, :author => user,
+                                         :assigned_to => group)
+                 assert_equal [1, 2, 3, 4, 5], issue.new_statuses_allowed_to(user).map(&:id)
+               end
+               def test_new_statuses_allowed_to_should_consider_group_assignment
+                 WorkflowTransition.delete_all
+                 WorkflowTransition.create!(:role_id => 1, :tracker_id => 1,
+                                            :old_status_id => 1, :new_status_id => 4,
+                                            :author => false, :assignee => true)
+                 user = User.find(2)
+                 group = Group.generate!
+                 group.users << user
+                 issue = Issue.generate!(:author_id => 1, :assigned_to => group)
+                 assert_include 4, issue.new_statuses_allowed_to(user).map(&:id)
                end
                def test_new_statuses_allowed_to_should_return_all_transitions_for_admin

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