Merged r12056 from trunk (#14447).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12064 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-28 20:46:53 +00:00
parent 591922c365
commit e8757fec2b
2 changed files with 29 additions and 5 deletions
@@ -744,12 +744,16 @@ class Issue < ActiveRecord::Base
        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