Merged r14970 to r14972 (#21477).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14981 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2015-12-19 08:02:31 +00:00
parent b7a16814cb
commit 21e551369c
2 changed files with 15 additions and 1 deletions

View File

@@ -783,7 +783,7 @@ class Issue < ActiveRecord::Base
# Users the issue can be assigned to
def assignable_users
users = project.assignable_users.to_a
users << author if author
users << author if author && author.active?
users << assigned_to if assigned_to
users.uniq.sort
end

View File

@@ -1875,6 +1875,20 @@ class IssueTest < ActiveSupport::TestCase
assert issue.assignable_users.include?(non_project_member)
end
def test_assignable_users_should_not_include_anonymous_user
issue = Issue.generate!(:author => User.anonymous)
assert !issue.assignable_users.include?(User.anonymous)
end
def test_assignable_users_should_not_include_locked_user
user = User.generate!
issue = Issue.generate!(:author => user)
user.lock!
assert !issue.assignable_users.include?(user)
end
test "#assignable_users should include the current assignee" do
user = User.generate!
issue = Issue.generate!(:assigned_to => user)