From adf8c09fd43c5c2b6509070c2e847e6e6fc4cd3d Mon Sep 17 00:00:00 2001
From: Kevin Papst <kevinpapst@users.noreply.github.com>
Date: Wed, 3 Mar 2021 11:31:29 +0100
Subject: [PATCH] refactored permission templates to match controller (#2391)

---
 src/Controller/PermissionController.php         |  4 ++--
 src/Controller/UserController.php               | 11 ++++-------
 templates/permission/actions.html.twig          | 17 +++++++++++++++++
 .../{user => permission}/edit_role.html.twig    |  2 +-
 .../{user => permission}/permissions.html.twig  |  2 +-
 .../user/{edit.html.twig => create.html.twig}   |  0
 6 files changed, 25 insertions(+), 11 deletions(-)
 create mode 100644 templates/permission/actions.html.twig
 rename templates/{user => permission}/edit_role.html.twig (91%)
 rename templates/{user => permission}/permissions.html.twig (98%)
 rename templates/user/{edit.html.twig => create.html.twig} (100%)

diff --git a/src/Controller/PermissionController.php b/src/Controller/PermissionController.php
index ac0c4b26..00665b5f 100644
--- a/src/Controller/PermissionController.php
+++ b/src/Controller/PermissionController.php
@@ -160,7 +160,7 @@ final class PermissionController extends AbstractController
 
         $dispatcher->dispatch($event);
 
-        return $this->render('user/permissions.html.twig', [
+        return $this->render('permission/permissions.html.twig', [
             'token' => $csrfTokenManager->refreshToken(self::TOKEN_NAME)->getValue(),
             'roles' => array_values($roles),
             'sorted' => $event->getPermissions(),
@@ -196,7 +196,7 @@ final class PermissionController extends AbstractController
             return $this->redirectToRoute('admin_user_permissions');
         }
 
-        return $this->render('user/edit_role.html.twig', [
+        return $this->render('permission/edit_role.html.twig', [
             'form' => $form->createView(),
             'role' => $role,
         ]);
diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php
index 879302fc..181c096d 100644
--- a/src/Controller/UserController.php
+++ b/src/Controller/UserController.php
@@ -144,13 +144,10 @@ final class UserController extends AbstractController
             $editForm->get('create_more')->setData(true);
         }
 
-        return $this->render(
-            'user/edit.html.twig',
-            [
-                'user' => $user,
-                'form' => $editForm->createView()
-            ]
-        );
+        return $this->render('user/create.html.twig', [
+            'user' => $user,
+            'form' => $editForm->createView()
+        ]);
     }
 
     /**
diff --git a/templates/permission/actions.html.twig b/templates/permission/actions.html.twig
new file mode 100644
index 00000000..55b65c82
--- /dev/null
+++ b/templates/permission/actions.html.twig
@@ -0,0 +1,17 @@
+{% macro user_permissions(view) %}
+    {% import "macros/widgets.html.twig" as widgets %}
+    {% set actions = {} %}
+
+    {% if view != 'index' and is_granted('role_permissions') %}
+        {% set actions = actions|merge({'permissions': path('admin_user_permissions')}) %}
+    {% endif %}
+
+    {% if view != 'role' and is_granted('role_permissions') %}
+        {% set actions = actions|merge({'create': {'url': path('admin_user_roles'), 'class': 'modal-ajax-form'}}) %}
+    {% endif %}
+
+    {% set actions = actions|merge({'help': {'url': 'permissions.html'|docu_link, 'target': '_blank'}}) %}
+
+    {% set event = trigger('actions.user_permissions', {'actions': actions, 'view': view}) %}
+    {{ widgets.page_actions(event.payload.actions) }}
+{% endmacro %}
diff --git a/templates/user/edit_role.html.twig b/templates/permission/edit_role.html.twig
similarity index 91%
rename from templates/user/edit_role.html.twig
rename to templates/permission/edit_role.html.twig
index 2a99c924..73acd1fe 100644
--- a/templates/user/edit_role.html.twig
+++ b/templates/permission/edit_role.html.twig
@@ -1,6 +1,6 @@
 {% extends app.request.xmlHttpRequest ? 'form.html.twig' : 'base.html.twig' %}
 {% import "macros/widgets.html.twig" as widgets %}
-{% import "user/actions.html.twig" as actions %}
+{% import "permission/actions.html.twig" as actions %}
 
 {% block page_title %}{{ 'user_role.title'|trans }}{% endblock %}
 {% block page_actions %}{{ actions.user_permissions('role') }}{% endblock %}
diff --git a/templates/user/permissions.html.twig b/templates/permission/permissions.html.twig
similarity index 98%
rename from templates/user/permissions.html.twig
rename to templates/permission/permissions.html.twig
index 3a2c1159..bd812743 100644
--- a/templates/user/permissions.html.twig
+++ b/templates/permission/permissions.html.twig
@@ -2,7 +2,7 @@
 {% import "macros/datatables.html.twig" as tables %}
 {% import "macros/widgets.html.twig" as widgets %}
 {% import "macros/toolbar.html.twig" as toolbar %}
-{% import "user/actions.html.twig" as actions %}
+{% import "permission/actions.html.twig" as actions %}
 
 {% set columns = {
     'label.name': 'alwaysVisible',
diff --git a/templates/user/edit.html.twig b/templates/user/create.html.twig
similarity index 100%
rename from templates/user/edit.html.twig
rename to templates/user/create.html.twig