Merge branch '5.17' into 5.x

ems-project · Jun 10, 2024 · b1269c3 · b1269c3
2 parents 950f11d + 810f77f
commit b1269c3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/skeleton/template/structure/by_path.html.twig b/skeleton/template/structure/by_path.html.twig
@@ -40,11 +40,11 @@
     {% set currentStructure = structure.structure|default("[]")|ems_json_menu_nested_decode %}
 {% else %}
     {% set target = emsch_search_one('page', { "query": { "term": { ("#{locale}.slug") : (path) } } }) %}
+    {% set switchUrls = locales|filter(p => p != locale and attribute(source, p).slug is defined)|map(l => path('emsch_path', { 'path': attribute(source, l).slug, '_locale': l })) %}
 {% endif %}
 
 {% if target is defined %}
     {% set source = target.source|default(null) %}
-    {% set switchUrls = ['nl', 'fr']|filter(p => p != locale and attribute(source, p).slug is defined)|map(l => path('emsch_path', { 'path': attribute(source, l).slug, '_locale': l })) %}
 {% else %}
     {% do emsch_http_error(404) %}
 {% endif %}

diff --git a/skeleton/template_ems/dashboard/sitemap.twig b/skeleton/template_ems/dashboard/sitemap.twig
@@ -35,6 +35,7 @@
                         'field_path': '[structure]',
                         'template': '@EMSCH/template_ems/dashboard/json_menu_nested.twig',
                         'context_block': 'build_context',
+                        'active_item_id': app.request.get('activeItemId')|default(null),
                         'context': {
                             'sectionLabel': section._source.label,
                             'locale': locale
@@ -62,12 +63,7 @@
 {%  block ems_footer %}
     <script>
         window.addEventListener('emsReady', function () {
-            let url = new URL(window.location.href)
-            let activeItemId = url.searchParams.get('activeItemId');
-
             Object.values(window.jsonMenuNestedComponents).forEach((jmn) => {
-                if (activeItemId) jmn.load({ activeItemId: activeItemId });
-
                 jmn.element.addEventListener('jmn-load', (event) => onJmnLoad(jmn, event));
                 jmn.element.addEventListener('jmn-add', (event) => onJmnAdd(jmn, event));
                 jmn.element.addEventListener('jmn-modal-custom', (event) => onJmnModalCustom(jmn, event));