##// END OF EJS Templates
fix wrong issue 'assigned-to-my-group' css class (#16038)...
Toshi MARUYAMA -
r12569:a0baf7ee5d41
parent child
Show More
@@ -1091,7 +1091,7 class Issue < ActiveRecord::Base
1091 if user.logged?
1091 if user.logged?
1092 s << ' created-by-me' if author_id == user.id
1092 s << ' created-by-me' if author_id == user.id
1093 s << ' assigned-to-me' if assigned_to_id == user.id
1093 s << ' assigned-to-me' if assigned_to_id == user.id
1094 s << ' assigned-to-my-group' if user.groups.any? {|g| g.id = assigned_to_id}
1094 s << ' assigned-to-my-group' if user.groups.any? {|g| g.id == assigned_to_id}
1095 end
1095 end
1096 s
1096 s
1097 end
1097 end
@@ -2254,16 +2254,19 class IssueTest < ActiveSupport::TestCase
2254 assert_include 'priority-highest', classes
2254 assert_include 'priority-highest', classes
2255 end
2255 end
2256
2256
2257 def test_css_classes_should_include_user_assignment
2257 def test_css_classes_should_include_user_and_group_assignment
2258 issue = Issue.generate(:assigned_to_id => 2)
2258 project = Project.first
2259 assert_include 'assigned-to-me', issue.css_classes(User.find(2))
2259 user = User.generate!
2260 assert_not_include 'assigned-to-me', issue.css_classes(User.find(3))
2260 group = Group.generate!
2261 end
2261 Member.create!(:principal => group, :project => project, :role_ids => [1, 2])
2262
2262 group.users << user
2263 def test_css_classes_should_include_user_group_assignment
2263 assert user.member_of?(project)
2264 issue = Issue.generate(:assigned_to_id => 10)
2264 issue1 = Issue.generate(:assigned_to_id => group.id)
2265 assert_include 'assigned-to-my-group', issue.css_classes(Group.find(10).users.first)
2265 assert_include 'assigned-to-my-group', issue1.css_classes(user)
2266 assert_not_include 'assigned-to-my-group', issue.css_classes(User.find(3))
2266 assert_not_include 'assigned-to-me', issue1.css_classes(user)
2267 issue2 = Issue.generate(:assigned_to_id => user.id)
2268 assert_not_include 'assigned-to-my-group', issue2.css_classes(user)
2269 assert_include 'assigned-to-me', issue2.css_classes(user)
2267 end
2270 end
2268
2271
2269 def test_save_attachments_with_hash_should_save_attachments_in_keys_order
2272 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