6.9 Fix tree node locator to work with umlauts correctly

CandoImage · Apr 17, 2024 · cad994e · cad994e
1 parent 80aca0b
commit cad994e
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/bundles/AdminBundle/Resources/public/js/pimcore/treenodelocator.js b/bundles/AdminBundle/Resources/public/js/pimcore/treenodelocator.js
@@ -472,11 +472,14 @@ pimcore.treenodelocator = function()
                 return -1;
             }
 
-            if (firstElementChild && elementKey.toUpperCase() < firstElementChild.data.text.toUpperCase()) {
+            // Cando fix: simple string comparison is not working as expected, because umlauts and special characters
+            // will be sort by their ASCII codes. In that case we have to use the upper case version of the string
+            // with the locale compare function. Should this be extended with the admin ui locale?
+            if (firstElementChild && elementKey.toUpperCase().localeCompare(firstElementChild.data.text.toUpperCase()) === -1) {
                 return -1;
             }
 
-            if (lastElementChild && elementKey.toUpperCase() > lastElementChild.data.text.toUpperCase()) {
+            if (lastElementChild && elementKey.toUpperCase().localeCompare(lastElementChild.data.text.toUpperCase()) === 1) {
                 return 1;
             }