Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-12-15 21:10:27 +01:00
Code Issues Packages Projects Releases Activity

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

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/6.1-stable@24196 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2025-12-01 09:47:34 +00:00
parent 84ecede80e
commit 3bb43076de
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/users/_list.html.erb
View File

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

4
test/functional/users_controller_test.rb
View File

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