Merge pull request #2262 from keepassxreboot/fix/credential_sorting

Fix credential sorting
This commit is contained in:
Sami Vänttinen 2024-07-04 22:55:57 +03:00 committed by GitHub
commit 49e8e1a354
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -405,7 +405,7 @@ kpxc.initLoginPopup = function() {
return {
title: title,
group: credential.group,
group: credential.group || '',
visibleLogin: visibleLogin,
login: credential.login,
loginId: loginId,
@ -416,10 +416,10 @@ kpxc.initLoginPopup = function() {
// Sorting with or without group name included
const sortLoginItemBy = function(a, b, name, withGroup = false) {
const firstGroup = a.group.toLowerCase();
const secondGroup = b.group.toLowerCase();
const first = a[name].toLowerCase();
const second = b[name].toLowerCase();
const firstGroup = a.group?.toLowerCase();
const secondGroup = b.group?.toLowerCase();
const first = a[name]?.toLowerCase();
const second = b[name]?.toLowerCase();
return withGroup
? firstGroup.localeCompare(secondGroup) || first.localeCompare(second)