quine-global-labs/mirror-cockpit-project-cockpit
1
0
Fork 0
mirror of https://github.com/cockpit-project/cockpit.git synced 2026-11-03 21:49:50 -09:00
Code Issues Projects Releases Packages Wiki Activity

users: Fix locale sort for groups

Browse source 
Within account details there is a select dropdown to select groups for a
user. This was meant to be sorted by `isAdmin` field, followed by
alphabetical order. In reality the alphabetical sorting wasn't done
correctly and we got strange sorting. On top of that, the `isAdmin` sort
method didn't take into consideration sorting the groups with `isAdmin`
set to true.

Fixes: https://github.com/cockpit-project/cockpit/issues/22909
Signed-off-by: Freya Gustavsson <freya@venefilyn.se>
This commit is contained in:
Freya Gustavsson 2026-09-22 16:45:50 +02:00 committed by Jelle van der Waa
parent acde760e23
commit 855eab6059
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkg/users/users.js
View file

@ -29,14 +29,11 @@ superuser.reload_page_on_change();
export const admins = ['sudo', 'root', 'wheel'];
const sortGroups = groups => {
return groups.sort((a, b) => {
if (a.isAdmin)
if (a.isAdmin && !b.isAdmin)
return -1;
if (b.isAdmin)
if (!a.isAdmin && b.isAdmin)
return 1;
if (a.members === b.members)
return a.name.localeCompare(b.name);
else
return b.members - a.members;
return a.name.localeCompare(b.name);
});
};

2
test/reference

@ -1 +1 @@
Subproject commit d60e1985af04ad4b80792133817f7375026bc596
Subproject commit e601537a2dfc8eaa377aeb7510e104160de04d40