Merge remote-tracking branch 'origin/1.2' into 1.x

pimcore · Nov 5, 2024 · 82a567e · 82a567e
2 parents 9ec75e0 + c3223f1
commit 82a567e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/FilterService/FilterType/MultiSelectCategory.php b/src/FilterService/FilterType/MultiSelectCategory.php
@@ -96,7 +96,7 @@ public function addCondition(AbstractFilterDefinitionType $filterDefinition, Pro
                     $category = $category->getId();
                 }
 
-                $category = '%,' . trim($category) . ',%';
+                $category = '%,' . trim((string)$category) . ',%';
 
                 $conditions[] = $filterDefinition->getField() . ' LIKE ' . $db->quote($category);
             }

diff --git a/src/Resources/public/js/indexfieldselectionfield/tags/indexFieldSelection.js b/src/Resources/public/js/indexfieldselectionfield/tags/indexFieldSelection.js
@@ -62,10 +62,10 @@ pimcore.object.tags.indexFieldSelection = Class.create(pimcore.object.tags.selec
                     load: function(store) {
                         if(this.data) {
                             if(this.preSelectCombobox.rendered) {
-                                this.preSelectCombobox.setValue(this.data.preSelect.split(',').map(Number));
+                                this.preSelectCombobox.setValue(this.getPreselectValue());
                             } else {
                                 this.preSelectCombobox.addListener("afterRender", function() {
-                                    this.preSelectCombobox.setValue(this.data.preSelect.split(',').map(Number));
+                                    this.preSelectCombobox.setValue(this.getPreselectValue());
                                 }.bind(this));
                             }
                         }
@@ -239,10 +239,10 @@ pimcore.object.tags.indexFieldSelection = Class.create(pimcore.object.tags.selec
 
         if(this.fieldConfig.multiPreSelect == 'local_single' || this.fieldConfig.multiPreSelect == 'local_multi') {
             if(this.preSelectCombobox.rendered) {
-                this.preSelectCombobox.setValue(this.data.preSelect.split(',').map(Number));
+                this.preSelectCombobox.setValue(this.getPreselectValue());
             } else {
                 this.preSelectCombobox.addListener("afterRender", function() {
-                    this.preSelectCombobox.setValue(this.data.preSelect.split(',').map(Number));
+                    this.preSelectCombobox.setValue(this.getPreselectValue());
                 }.bind(this));
             }
         }
@@ -262,5 +262,12 @@ pimcore.object.tags.indexFieldSelection = Class.create(pimcore.object.tags.selec
 
     isDirty: function() {
         return this.fieldsCombobox.isDirty() || (this.preSelectCombobox && this.preSelectCombobox.isDirty());
+    },
+
+    getPreselectValue: function() {
+        if(this.fieldConfig.filterGroups?.includes('relation')) {
+            return this.data.preSelect?.split(',').map(Number);
+        }
+        return this.data.preSelect?.split(',');
     }
 });