Merge remote-tracking branch 'origin/4.4'

ibexa · Apr 12, 2023 · 613d946 · 613d946
2 parents ea713a8 + 981e608
commit 613d946
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/src/bundle/Resources/public/js/scripts/core/tag.view.select.js b/src/bundle/Resources/public/js/scripts/core/tag.view.select.js
@@ -89,7 +89,7 @@
 
         removeItems(items) {
             const prevSelectedIds = this.inputField.value.split(this.inputSeparator);
-            const nextSelectedIds = prevSelectedIds.filter((savedId) => !items.includes(parseInt(savedId, 10)));
+            const nextSelectedIds = prevSelectedIds.filter((savedId) => !items.includes(savedId));
             this.inputField.value = nextSelectedIds.join(this.inputSeparator);
 
             items.forEach((itemId) => {
@@ -120,7 +120,7 @@
             const selectedItems = [...this.listContainer.querySelectorAll('[data-id]')];
 
             selectedItems.forEach((selectedItem) => {
-                const id = parseInt(selectedItem.dataset.id, 10);
+                const { id } = selectedItem.dataset;
                 const deleteButton = selectedItem.querySelector('.ibexa-tag-view-select__selected-item-tag-remove-btn');
 
                 deleteButton.addEventListener('click', () => this.removeItem(id), false);

diff --git a/src/bundle/Resources/public/scss/_popup-menu.scss b/src/bundle/Resources/public/scss/_popup-menu.scss
@@ -18,7 +18,6 @@
     &__item {
         display: flex;
         align-items: center;
-        height: calculateRem(40px);
         min-width: calculateRem(150px);
         transition: all $ibexa-admin-transition-duration $ibexa-admin-transition;
 

diff --git a/src/bundle/Resources/views/themes/admin/ui/search/filters.html.twig b/src/bundle/Resources/views/themes/admin/ui/search/filters.html.twig
@@ -73,7 +73,7 @@
 
             {% if content_breadcrumbs is not empty %}
                 {% set items = [{
-                    id: 'selected-subtree',
+                    id: form.subtree.vars.value,
                     name: content_breadcrumbs
                 }] %}
             {% endif %}