Merged r24195 from trunk to 6.1-stable (#43282).

git-svn-id: https://svn.redmine.org/redmine/branches/6.1-stable@24196 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/views/users/_list.html.erb

@@ -31,7 +31,7 @@
       </td>
     </tr>
   <% end %>
-  <tr id="user-<%= user.id %>" class="user <%= cycle("odd", "even") %> hascontextmenu">
+  <tr id="user-<%= user.id %>" class="hascontextmenu <%= cycle("odd", "even") %> <%= user.css_classes %>">
     <td class="checkbox hide-when-print"><%= check_box_tag("ids[]", user.id, false, id: nil) %></td>
     <% @query.inline_columns.each do |column| %>
       <% if column.name == :login %>

test/functional/users_controller_test.rb

@@ -33,14 +33,14 @@ class UsersControllerTest < Redmine::ControllerTest
     active = User.active.first
     locked = User.where(status: User::STATUS_LOCKED).first
     assert_select 'table.users'
-    assert_select "tr#user-#{active.id}"
+    assert_select "tr.user.active#user-#{active.id}"
     assert_select "tr#user-#{locked.id}", 0
   end
 
   def test_index_with_status_filter
     get :index, params: { set_filter: 1, f: ['status'], op: {status: '='}, v: {status: [3]} }
     assert_response :success
-    assert_select "tr.user", User.where(status: 3).count
+    assert_select "tr.user.locked", User.where(status: 3).count
   end
 
   def test_index_with_firstname_filter