##// END OF EJS Templates
Merged r12844 (#16038)....
Jean-Philippe Lang -
r12577:d6b718b43c4c
parent child
Show More
@@ -1089,7 +1089,7 class Issue < ActiveRecord::Base
1089 1089 if user.logged?
1090 1090 s << ' created-by-me' if author_id == user.id
1091 1091 s << ' assigned-to-me' if assigned_to_id == user.id
1092 s << ' assigned-to-my-group' if user.groups.any? {|g| g.id = assigned_to_id}
1092 s << ' assigned-to-my-group' if user.groups.any? {|g| g.id == assigned_to_id}
1093 1093 end
1094 1094 s
1095 1095 end
@@ -2202,16 +2202,19 class IssueTest < ActiveSupport::TestCase
2202 2202 assert_include 'priority-highest', classes
2203 2203 end
2204 2204
2205 def test_css_classes_should_include_user_assignment
2206 issue = Issue.generate(:assigned_to_id => 2)
2207 assert_include 'assigned-to-me', issue.css_classes(User.find(2))
2208 assert_not_include 'assigned-to-me', issue.css_classes(User.find(3))
2209 end
2210
2211 def test_css_classes_should_include_user_group_assignment
2212 issue = Issue.generate(:assigned_to_id => 10)
2213 assert_include 'assigned-to-my-group', issue.css_classes(Group.find(10).users.first)
2214 assert_not_include 'assigned-to-my-group', issue.css_classes(User.find(3))
2205 def test_css_classes_should_include_user_and_group_assignment
2206 project = Project.first
2207 user = User.generate!
2208 group = Group.generate!
2209 Member.create!(:principal => group, :project => project, :role_ids => [1, 2])
2210 group.users << user
2211 assert user.member_of?(project)
2212 issue1 = Issue.generate(:assigned_to_id => group.id)
2213 assert_include 'assigned-to-my-group', issue1.css_classes(user)
2214 assert_not_include 'assigned-to-me', issue1.css_classes(user)
2215 issue2 = Issue.generate(:assigned_to_id => user.id)
2216 assert_not_include 'assigned-to-my-group', issue2.css_classes(user)
2217 assert_include 'assigned-to-me', issue2.css_classes(user)
2215 2218 end
2216 2219
2217 2220 def test_save_attachments_with_hash_should_save_attachments_in_keys_order
General Comments 0
You need to be logged in to leave comments. Login now