summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/models/issue.rb1
-rw-r--r--test/unit/issue_test.rb9
2 files changed, 10 insertions, 0 deletions
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 79c491547..d24adc18a 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -449,6 +449,7 @@ class Issue < ActiveRecord::Base
def assignable_users
users = project.assignable_users
users << author if author
+ users << assigned_to if assigned_to
users.uniq.sort
end
diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb
index cf759b43d..d19c9458c 100644
--- a/test/unit/issue_test.rb
+++ b/test/unit/issue_test.rb
@@ -674,6 +674,15 @@ class IssueTest < ActiveSupport::TestCase
assert issue.assignable_users.include?(non_project_member)
end
+ should "include the current assignee" do
+ project = Project.find(1)
+ user = User.generate!
+ issue = Issue.generate_for_project!(project, :assigned_to => user)
+ user.lock!
+
+ assert Issue.find(issue.id).assignable_users.include?(user)
+ end
+
should "not show the issue author twice" do
assignable_user_ids = Issue.find(1).assignable_users.collect(&:id)
assert_equal 2, assignable_user_ids.length