Skip to content

Fixes #571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
flkasper wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fixes #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Engine/Modules/AdminBackend/Core/Services/BackendNavigationService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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'])) {
Expand Down Expand Up @@ -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]);
}
}
Expand Down
4 changes: 1 addition & 3 deletions Themes/Base/Backend/CRUD/Components/ViewBase.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
108 changes: 53 additions & 55 deletions Themes/Base/Backend/CRUD/Index.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 %}