From 65a86c315f36ee7395c3358e74bff9eb52d969ab Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Mon, 17 Mar 2025 10:53:09 +0100 Subject: [PATCH] CrudConfiguration::setShowActions: add context when setting this parameter --- CHANGELOG.md | 3 +++ src/core/Crud/CrudConfiguration.php | 10 +++++----- .../Resources/views/admin/crud/index.html.twig | 16 +++++++++------- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d779bab..da01117 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,14 @@ ## [Unreleased] +## [v1.26.0] - 2025-03-17 ### Added * FileUploadHandler: allow to upload multiple files * CrudController: allow to add callables after creation, update and delation ### Fixed * fix(crud): use context variable to retrieve the form and the form options * fix(node): use `false` instead of `O` in query +### Changed +* CrudConfiguration::setShowActions: add context when setting this parameter ## [v1.25.2] - 2025-02-07 ### Added diff --git a/src/core/Crud/CrudConfiguration.php b/src/core/Crud/CrudConfiguration.php index badea06..c8d8935 100644 --- a/src/core/Crud/CrudConfiguration.php +++ b/src/core/Crud/CrudConfiguration.php @@ -27,7 +27,7 @@ class CrudConfiguration protected array $isSortableCollection = []; protected string $sortableCollectionProperty = 'sortOrder'; protected ?string $defaultLocale = null; - protected bool $showActions = true; + protected array $showActions = []; protected static $self; @@ -369,15 +369,15 @@ class CrudConfiguration return $this->sortableCollectionProperty; } - public function setShowActions(bool $showActions): self + public function setShowActions(string $page, bool $showActions): self { - $this->showActions = $showActions; + $this->showActions[$page] = $showActions; return $this; } - public function getShowActions(): bool + public function getShowActions(string $page): bool { - return $this->showActions; + return $this->showActions[$page] ?? true; } } diff --git a/src/core/Resources/views/admin/crud/index.html.twig b/src/core/Resources/views/admin/crud/index.html.twig index 039ac1e..a76c9b7 100644 --- a/src/core/Resources/views/admin/crud/index.html.twig +++ b/src/core/Resources/views/admin/crud/index.html.twig @@ -149,7 +149,7 @@ {% endblock %} {% endfor %} - {% if configuration.showActions %} + {% if configuration.showActions(context) %} {{ 'Actions'|trans }} @@ -184,14 +184,16 @@ {% block list_item %} {%- set dbClick %} - {% if configuration.action(context, 'show', true, [item]) %} - {{ path(configuration.pageRoute('show'), {entity: item.id}|merge(configuration.pageRouteParams('show'))) }} - {% elseif configuration.action(context, 'edit', true, [item]) %} - {{ path(configuration.pageRoute('edit'), {entity: item.id}|merge(configuration.pageRouteParams('show'))) }} + {% if configuration.doubleClick(context) %} + {% if configuration.action(context, 'show', true, [item]) %} + {{ path(configuration.pageRoute('show'), {entity: item.id}|merge(configuration.pageRouteParams('show'))) }} + {% elseif configuration.action(context, 'edit', true, [item]) %} + {{ path(configuration.pageRoute('edit'), {entity: item.id}|merge(configuration.pageRouteParams('show'))) }} + {% endif %} {% endif %} {% endset -%} - + {% if configuration.hasBatchAction(context) %} @@ -228,7 +230,7 @@ {% endfor %} - {% if configuration.showActions %} + {% if configuration.showActions(context) %} {% block list_item_actions %} {% block list_item_actions_before %}{% endblock %}