Merge remote-tracking branch 'upstream/master'

netgen-layouts · Dec 8, 2023 · 9188832 · 9188832
2 parents 7f3c83a + accb3d9
commit 9188832
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/bundle/Debug/DataCollector/LayoutUrlGenerator.php b/bundle/Debug/DataCollector/LayoutUrlGenerator.php
@@ -15,11 +15,13 @@ final class LayoutUrlGenerator implements LayoutUrlGeneratorInterface
     public function __construct(
         private LayoutUrlGeneratorInterface $innerGenerator,
         private array $siteAccessGroups,
+        private string $siteAccessGroupName,
+        private string $defaultSiteAccessName,
     ) {}
 
     public function generateLayoutUrl(UuidInterface $layoutId, array $parameters = []): string
     {
-        $adminSiteAccess = $this->siteAccessGroups['admin_group'][0] ?? 'admin';
+        $adminSiteAccess = $this->siteAccessGroups[$this->siteAccessGroupName][0] ?? $this->defaultSiteAccessName;
 
         return $this->innerGenerator->generateLayoutUrl($layoutId, ['siteaccess' => $adminSiteAccess]);
     }

diff --git a/bundle/Resources/config/debug/services.yaml b/bundle/Resources/config/debug/services.yaml
@@ -1,7 +1,13 @@
+parameters:
+    netgen_layouts.ibexa.data_collector.site_access_group_name: 'admin_group'
+    netgen_layouts.ibexa.data_collector.default_site_access_name: 'admin'
+
 services:
     netgen_layouts.ibexa.debug.data_collector.layout_url_generator:
         class: Netgen\Bundle\LayoutsIbexaBundle\Debug\DataCollector\LayoutUrlGenerator
         decorates: netgen_layouts.debug.data_collector.layout_url_generator
         arguments:
             - "@.inner"
             - "%ibexa.site_access.groups%"
+            - "%netgen_layouts.ibexa.data_collector.site_access_group_name%"
+            - "%netgen_layouts.ibexa.data_collector.default_site_access_name%"