From 613d7b0c90bad5fbcff97fb3acd45ee5d077b81f Mon Sep 17 00:00:00 2001 From: jurgenhaas <juergen.haas@lakedrops.com> Date: Sat, 15 Jun 2024 09:31:39 +0200 Subject: [PATCH] Update patch for gin toolbar --- patches/d10/3319445.diff | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/patches/d10/3319445.diff b/patches/d10/3319445.diff index 01fd19e..c97724d 100644 --- a/patches/d10/3319445.diff +++ b/patches/d10/3319445.diff @@ -1,5 +1,5 @@ diff --git a/gin_toolbar.module b/gin_toolbar.module -index 3fb44b40c1c3c977775637bad7d9fda8beeb90c3..86e65051a9b6c791573100acb3d743c84042cdbe 100644 +index f30970a7d3b6a88c0b45e4c7343da3356f293b82..77e96c4c118f75965ea1968826e4c0feda79157d 100644 --- a/gin_toolbar.module +++ b/gin_toolbar.module @@ -8,6 +8,7 @@ @@ -10,7 +10,7 @@ index 3fb44b40c1c3c977775637bad7d9fda8beeb90c3..86e65051a9b6c791573100acb3d743c8 use Drupal\gin\GinNavigation; use Drupal\gin\GinSettings; use Drupal\gin\GinUserPicture; -@@ -212,8 +213,13 @@ function gin_toolbar_preprocess_toolbar(&$variables) { +@@ -256,8 +257,13 @@ function gin_toolbar_preprocess_toolbar(&$variables) { $entity = \Drupal::request()->attributes->get($matches['entity_type_id']); if ($entity instanceof EntityInterface && $entity->hasLinkTemplate('edit-form')) { @@ -26,16 +26,3 @@ index 3fb44b40c1c3c977775637bad7d9fda8beeb90c3..86e65051a9b6c791573100acb3d743c8 } } } -diff --git a/templates/toolbar.html.twig b/templates/toolbar.html.twig -index f050f4d1c354fef8a9726c8164d0ae45579b1cc5..758cedbcc9fe8aa347b3390c063f1881c3014c10 100644 ---- a/templates/toolbar.html.twig -+++ b/templates/toolbar.html.twig -@@ -16,7 +16,7 @@ - <li class="gin-breadcrumb__item"> - {% if entity_edit_url and entity_title %} - <a class="gin-breadcrumb__link gin-back-to-admin" href="{{ entity_edit_url }}">{{ 'Edit %title'|t({ '%title': entity_title }) }}</a> -- {% else %} -+ {% elseif access_admin_content %} - <a class="gin-breadcrumb__link gin-back-to-admin" href="{{ path('system.admin_content') }}">{{ 'Back to Administration'|t }}</a> - {% endif %} - </li> -- GitLab