From c6f7124b1ed2d1eb66841196d6af8170eaa45b92 Mon Sep 17 00:00:00 2001
From: FK <fk@7pkonzepte.de>
Date: Thu, 18 Feb 2021 16:55:37 +0100
Subject: [PATCH] Fixes

- remove section in crud view (removes additional padding of c0ntent)
- BackendNavigationService: restrict removing of root node in navigation tree to sidebar
---
 .../Services/BackendNavigationService.php     |   8 +-
 .../Backend/CRUD/Components/ViewBase.twig     |   4 +-
 Themes/Base/Backend/CRUD/Index.twig           | 108 +++++++++---------
 3 files changed, 58 insertions(+), 62 deletions(-)

diff --git a/Engine/Modules/AdminBackend/Core/Services/BackendNavigationService.php b/Engine/Modules/AdminBackend/Core/Services/BackendNavigationService.php
index 7d4c1ac93..36fef316f 100644
--- a/Engine/Modules/AdminBackend/Core/Services/BackendNavigationService.php
+++ b/Engine/Modules/AdminBackend/Core/Services/BackendNavigationService.php
@@ -125,7 +125,7 @@ public function getNavigationTree(string $position) : array {
             /** @var BackendNavigation[] $entries */
             $entries = $this->repository()->findBy(['position' => $position, 'visible' => true, 'active' => true], ['order' => 'ASC']);
             $tree    = TreeHelper::modelArrayToTree($entries, 'parent', '0', 'name');
-            $this->filterTreeByPermission($permissionService, $user, $tree);
+            $this->filterTreeByPermission($permissionService, $user, $tree, $position);
 
             return $tree;
         } catch (Exception $exception) {
@@ -246,7 +246,7 @@ private function initActiveEndpointsData() {
      * @param array $user
      * @param array $array
      */
-    private function filterTreeByPermission(PermissionService $permissionService, ?array $user, array &$array) {
+    private function filterTreeByPermission(PermissionService $permissionService, ?array $user, array &$array, string $position) {
         foreach ($array as $index => &$item) {
             $checkChildren = true;
             if ($item['parent'] !== '0' && !empty($item['path'])) {
@@ -274,13 +274,13 @@ private function filterTreeByPermission(PermissionService $permissionService, ?a
             }
             if ($checkChildren && isset($item['children'])) {
                 if ($checkChildren) {
-                    $this->filterTreeByPermission($permissionService, $user, $item['children']);
+                    $this->filterTreeByPermission($permissionService, $user, $item['children'], $position);
                 }
                 if (empty($item['children'])) {
                     unset($array[$index]);
                 }
             }
-            if ($item['parent'] === '0' && (!isset($item['children']) || empty($item['children']))) {
+            if ($item['parent'] === '0' && (!isset($item['children']) || empty($item['children'])) && $position === 'sidebar') {
                 unset($array[$index]);
             }
         }
diff --git a/Themes/Base/Backend/CRUD/Components/ViewBase.twig b/Themes/Base/Backend/CRUD/Components/ViewBase.twig
index f4cccc81c..571e87cc3 100644
--- a/Themes/Base/Backend/CRUD/Components/ViewBase.twig
+++ b/Themes/Base/Backend/CRUD/Components/ViewBase.twig
@@ -18,7 +18,5 @@
 {% endblock %}
 
 {% block pagecontent %}
-    <section class="content">
-        {% include CRUD_path('Components/Form.twig') with { item: crud.item } %}
-    </section>
+    {% include CRUD_path('Components/Form.twig') with { item: crud.item } %}
 {% endblock %}
diff --git a/Themes/Base/Backend/CRUD/Index.twig b/Themes/Base/Backend/CRUD/Index.twig
index 21e2ea746..9dc5a4b30 100644
--- a/Themes/Base/Backend/CRUD/Index.twig
+++ b/Themes/Base/Backend/CRUD/Index.twig
@@ -1,66 +1,64 @@
 {% extends 'Backend/Master/Index.twig' %}
 
 {% block pagecontent %}
-    <section class="content">
-        <div class="row">
-            <div class="col-xs-12">
-                <div class="box box-primary">
-                    <div class="box-body">
+    <div class="row">
+        <div class="col-xs-12">
+            <div class="box box-primary">
+                <div class="box-body">
+                    <div class="row">
+                        <div class="col-xs-12">
+                            {% block crud_actions_row %}
+                                <p class="btn-group" role="group">
+                                    {% block crud_actions_group_items %}
+                                        <a href="{{ url(meta.route.name  ~ '_create') }}"
+                                           title="{{ i18n('backend_crud_btn_create', {en: 'create', de: 'erstellen'}) }}"
+                                           class="btn btn-primary {% if not crud.actions.create %}disabled{% endif %}">
+                                            <i class="fa fa-plus"></i>
+                                        </a>
+                                    {% endblock crud_actions_group_items %}
+                                </p>
+                            {% endblock crud_actions_row %}
+                        </div>
+                    </div>
+                    {% include CRUD_path('Components/Index/FilterBar.twig') with {
+                        crud: crud,
+                        meta: meta
+                    } %}
+                    {% if crud.hasEditors %}
+                    <form action="{{ url(meta.route.name, {}, meta.route.query|default({})) }}" method="post"
+                          enctype="multipart/form-data">
+                        {% endif %}
+                        {# {% include CRUD_path('Components/Index/PaginationRow.twig') with { #}
+                        {# pagination: crud.pagination, #}
+                        {# queryKeys: crud.queryKeys, #}
+                        {# route: meta.route #}
+                        {# } only %} #}
                         <div class="row">
-                            <div class="col-xs-12">
-                                {% block crud_actions_row %}
-                                    <p class="btn-group" role="group">
-                                        {% block crud_actions_group_items %}
-                                            <a href="{{ url(meta.route.name  ~ '_create') }}"
-                                               title="{{ i18n('backend_crud_btn_create', {en: 'create', de: 'erstellen'}) }}"
-                                               class="btn btn-primary {% if not crud.actions.create %}disabled{% endif %}">
-                                                <i class="fa fa-plus"></i>
-                                            </a>
-                                        {% endblock crud_actions_group_items %}
-                                    </p>
-                                {% endblock crud_actions_row %}
+                            <div class="col-xs-12 table-responsive">
+                                {% include CRUD_path('Components/Index/Table.twig') %}
                             </div>
                         </div>
-                        {% include CRUD_path('Components/Index/FilterBar.twig') with {
-                            crud: crud,
-                            meta: meta
-                        } %}
+                        {% include CRUD_path('Components/Index/PaginationRow.twig') with {
+                            pagination: crud.pagination,
+                            queryKeys: crud.queryKeys,
+                            route: meta.route
+                        } only %}
                         {% if crud.hasEditors %}
-                        <form action="{{ url(meta.route.name, {}, meta.route.query|default({})) }}" method="post"
-                              enctype="multipart/form-data">
-                            {% endif %}
-                            {#{% include CRUD_path('Components/Index/PaginationRow.twig') with {#}
-                            {#    pagination: crud.pagination,#}
-                            {#    queryKeys: crud.queryKeys,#}
-                            {#    route: meta.route#}
-                            {#} only %}#}
-                            <div class="row">
-                                <div class="col-xs-12 table-responsive">
-                                    {% include CRUD_path('Components/Index/Table.twig') %}
-                                </div>
-                            </div>
-                            {% include CRUD_path('Components/Index/PaginationRow.twig') with {
-                                pagination: crud.pagination,
-                                queryKeys: crud.queryKeys,
-                                route: meta.route
-                            } only %}
-                            {% if crud.hasEditors %}
-                            <p></p>
-                            <div class="row">
-                                <div class="col-xs-12">
-                                    <div class="form-group">
-                                        <input type="hidden" name="action" value="update" />
-                                        <input type="submit" class="btn btn-primary"
-                                               value="{{ i18n('backend_crud_btn_update', {en: 'update', de: 'aktualisieren'}) }}"
-                                               title="{{ i18n('backend_crud_btn_update', {en: 'update', de: 'aktualisieren'}) }}">
-                                    </div>
+                        <p></p>
+                        <div class="row">
+                            <div class="col-xs-12">
+                                <div class="form-group">
+                                    <input type="hidden" name="action" value="update"/>
+                                    <input type="submit" class="btn btn-primary"
+                                           value="{{ i18n('backend_crud_btn_update', {en: 'update', de: 'aktualisieren'}) }}"
+                                           title="{{ i18n('backend_crud_btn_update', {en: 'update', de: 'aktualisieren'}) }}">
                                 </div>
                             </div>
-                        </form>
-                        {% endif %}
-                    </div>{# /.box-body #}
-                </div>{# /.box #}
-            </div>
+                        </div>
+                    </form>
+                    {% endif %}
+                </div>{# /.box-body #}
+            </div>{# /.box #}
         </div>
-    </section>
+    </div>
 {% endblock pagecontent %}