meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-01-31 19:47:14 +00:00
Code Issues Releases Wiki Activity

Fix incorrect sorting of users grouped by status in issue filters for administrators (#41079).

Browse Source 
Patch by Vladislav Moiseev (user:vladdy.moses).


git-svn-id: https://svn.redmine.org/redmine/trunk@22947 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2024-08-11 08:30:40 +00:00
parent c96ef014dd
commit 174c237c70
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/query.rb
View File

@ -628,7 +628,7 @@ class Query < ApplicationRecord
author_values = []
author_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged?
author_values +=
users.sort_by(&:status).
users.sort_by{|p| [p.status, p]}.
collect{|s| [s.name, s.id.to_s, l("status_#{User::LABEL_BY_STATUS[s.status]}")]}
author_values << [l(:label_user_anonymous), User.anonymous.id.to_s]
author_values
@ -638,7 +638,7 @@ class Query < ApplicationRecord
assigned_to_values = []
assigned_to_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged?
assigned_to_values +=
(Setting.issue_group_assignment? ? principals : users).sort_by(&:status).
(Setting.issue_group_assignment? ? principals : users).sort_by{|p| [p.status, p]}.
collect{|s| [s.name, s.id.to_s, l("status_#{User::LABEL_BY_STATUS[s.status]}")]}
assigned_to_values
end
@ -668,7 +668,7 @@ class Query < ApplicationRecord
watcher_values = [["<< #{l(:label_me)} >>", "me"]]
if User.current.allowed_to?(:view_issue_watchers, self.project, global: true)
watcher_values +=
principals.sort_by(&:status).
principals.sort_by{|p| [p.status, p]}.
collect{|s| [s.name, s.id.to_s, l("status_#{User::LABEL_BY_STATUS[s.status]}")]}
end
watcher_values