fix

Pushword · Nov 16, 2023 · e2f52e7 · e2f52e7
1 parent 165057d
commit e2f52e7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/packages/admin-block-editor/src/templates/block/list.html.twig b/packages/admin-block-editor/src/templates/block/list.html.twig
@@ -1,4 +1,4 @@
-
+{#{{ blockWrapperAttr(block) }}#}
 {{ block.data.style == 'unordered' ? '<ul>' : '<ol>' }}
 {% for item in block.data.items %}
     {% if item.content is defined %}

diff --git a/packages/admin/src/Menu/PageMenuProvider.php b/packages/admin/src/Menu/PageMenuProvider.php
@@ -43,8 +43,9 @@ public function getMenu(): ItemInterface
         $menu = $factory->createItem('content', [
             'label' => $this->translator->trans('admin.label.content'),
             'route' => 'admin_page_list',
+            'name' => 'page',
         ])
-            ->setCurrent(true) // dirty hack to prevent bug
+            // ->setCurrent(true) // dirty hack to prevent bug
             // ->setExtra('keep_open', true)
             ->setExtra(self::ORDER_NUMBER, 1)
         ;
@@ -53,6 +54,7 @@ public function getMenu(): ItemInterface
 
         $isRequesteingRedirection = $this->isRequestingRedirection();
         if (\count($hosts) > 1) {
+            $pageMenu->setCurrent(true);
             foreach ($hosts as $host) {
                 $hostMenu = $pageMenu->addChild($host, [
                     'route' => 'admin_page_list',
@@ -68,10 +70,12 @@ public function getMenu(): ItemInterface
 
                 $hostMenu->setCurrent(true);
             }
-        } elseif ($this->isRequestingPageEdit() && ! $isRequesteingRedirection) {
-            $pageMenu->setCurrent(true);
         }
 
+        // if ($this->isRequestingPageEdit() && ! $isRequesteingRedirection) {
+        //     $pageMenu->setCurrent(true);
+        // }
+
         $menu->addChild('admin.label.cheatsheet', ['route' => 'cheatsheetEditRoute']);
 
         return $menu;

diff --git a/packages/admin/src/templates/Menu/menu.html.twig b/packages/admin/src/templates/Menu/menu.html.twig
@@ -11,5 +11,9 @@
         {% do item.setAttribute('class', (item.getAttribute('class') ~ ' active')) %}
     {% endif %}
 
-    {{ parent() }}
+    {% if item.name in ['page'] %}
+        {% do item.setAttribute('class', (item.getAttribute('class')|replace({'treeview':''}))) %}
+    {% endif %}
+
+    {{ parent()|preg_replace('@treeview(.*/admin/app/page/list)@', '$1')|raw }}
 {% endblock %}