From 4610159759f44e43993c988b42ab25fde89834e0 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Tue, 5 Aug 2014 10:34:56 +0100
Subject: [PATCH] Issue #2314883 by Crell: Standardize role entity route names.
---
core/modules/user/src/Entity/Role.php | 6 +++---
core/modules/user/user.links.contextual.yml | 4 ++--
core/modules/user/user.links.task.yml | 6 +++---
core/modules/user/user.routing.yml | 6 +++---
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/core/modules/user/src/Entity/Role.php b/core/modules/user/src/Entity/Role.php
index e02c97a9b491..20cb00424e70 100644
--- a/core/modules/user/src/Entity/Role.php
+++ b/core/modules/user/src/Entity/Role.php
@@ -34,9 +34,9 @@
* "label" = "label"
* },
* links = {
- * "delete-form" = "user.role_delete",
- * "edit-form" = "user.role_edit",
- * "edit-permissions-form" = "user.admin_permission"
+ * "delete-form" = "entity.user_role.delete_form",
+ * "edit-form" = "entity.user_role.edit_form",
+ * "edit-permissions-form" = "entity.user_role.edit_permissions_form"
* }
* )
*/
diff --git a/core/modules/user/user.links.contextual.yml b/core/modules/user/user.links.contextual.yml
index 1e0df52dceb6..af1f9773920a 100644
--- a/core/modules/user/user.links.contextual.yml
+++ b/core/modules/user/user.links.contextual.yml
@@ -1,5 +1,5 @@
-user.role_delete:
+entity.user_role.delete_form:
title: 'Delete role'
group: role
weight: 10
- route_name: 'user.role_delete'
+ route_name: 'entity.user_role.delete_form'
diff --git a/core/modules/user/user.links.task.yml b/core/modules/user/user.links.task.yml
index 88957e40d85b..82178c2e55b6 100644
--- a/core/modules/user/user.links.task.yml
+++ b/core/modules/user/user.links.task.yml
@@ -1,8 +1,8 @@
-user.role_edit:
+entity.user_role.edit_form:
title: 'Edit'
- route_name: user.role_edit
- base_route: user.role_edit
+ route_name: entity.user_role.edit_form
+ base_route: entity.user_role.edit_form
user.account_settings_tab:
route_name: user.account_settings
diff --git a/core/modules/user/user.routing.yml b/core/modules/user/user.routing.yml
index 087ffecd23de..336339447613 100644
--- a/core/modules/user/user.routing.yml
+++ b/core/modules/user/user.routing.yml
@@ -67,7 +67,7 @@ user.admin_permissions:
requirements:
_permission: 'administer permissions'
-user.admin_permission:
+entity.user_role.edit_permissions_form:
path: '/admin/people/permissions/{user_role}'
defaults:
_form: '\Drupal\user\Form\UserPermissionsRoleSpecificForm'
@@ -99,7 +99,7 @@ user.role_add:
requirements:
_permission: 'administer permissions'
-user.role_edit:
+entity.user_role.edit_form:
path: '/admin/people/roles/manage/{user_role}'
defaults:
_entity_form: user_role.default
@@ -107,7 +107,7 @@ user.role_edit:
requirements:
_entity_access: user_role.update
-user.role_delete:
+entity.user_role.delete_form:
path: '/admin/people/roles/manage/{user_role}/delete'
defaults:
_entity_form: user_role.delete
--
GitLab