From ac0fe75eb8e604281cf0bcf8d48fd0a3851c5318 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Mon, 11 Aug 2014 21:54:07 -0500
Subject: [PATCH] Issue #2314863 by andypost, Crell: Standardize block content
entity route names.
---
.../block_content.links.contextual.yml | 4 ++--
.../block_content/block_content.links.task.yml | 18 +++++++++---------
.../block_content/block_content.routing.yml | 8 ++++----
.../block_content/src/Entity/BlockContent.php | 8 ++++----
.../src/Entity/BlockContentType.php | 4 ++--
5 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/core/modules/block_content/block_content.links.contextual.yml b/core/modules/block_content/block_content.links.contextual.yml
index 4751e6ce76d0..0653e2f0eea9 100644
--- a/core/modules/block_content/block_content.links.contextual.yml
+++ b/core/modules/block_content/block_content.links.contextual.yml
@@ -1,10 +1,10 @@
block_content.block_edit:
title: 'Edit'
group: block_content
- route_name: 'block_content.edit'
+ route_name: 'entity.block_content.canonical'
block_content.block_delete:
title: 'Delete'
group: block_content
- route_name: 'block_content.delete'
+ route_name: 'entity.block_content.delete_form'
weight: 1
diff --git a/core/modules/block_content/block_content.links.task.yml b/core/modules/block_content/block_content.links.task.yml
index 0674c99b6c69..61ab18a2b7d7 100644
--- a/core/modules/block_content/block_content.links.task.yml
+++ b/core/modules/block_content/block_content.links.task.yml
@@ -11,17 +11,17 @@ block_content.type_list:
route_name: block_content.type_list
parent_id: block_content.list
-block_content.edit:
+entity.block_content.canonical:
title: Edit
- route_name: block_content.edit
- base_route: block_content.edit
-block_content.delete:
+ route_name: entity.block_content.canonical
+ base_route: entity.block_content.canonical
+entity.block_content.delete_form:
title: Delete
- route_name: block_content.delete
- base_route: block_content.edit
+ route_name: entity.block_content.delete_form
+ base_route: entity.block_content.canonical
# Default tab for custom block type editing.
-block_content.type_edit:
+entity.block_content_type.edit_form:
title: 'Edit'
- route_name: block_content.type_edit
- base_route: block_content.type_edit
+ route_name: entity.block_content_type.edit_form
+ base_route: entity.block_content_type.edit_form
diff --git a/core/modules/block_content/block_content.routing.yml b/core/modules/block_content/block_content.routing.yml
index b6a1aaf13aba..1628b89225b5 100644
--- a/core/modules/block_content/block_content.routing.yml
+++ b/core/modules/block_content/block_content.routing.yml
@@ -26,7 +26,7 @@ block_content.add_form:
requirements:
_permission: 'administer blocks'
-block_content.type_delete:
+entity.block_content_type.delete_form:
path: '/admin/structure/block/block-content/manage/{block_content_type}/delete'
defaults:
_entity_form: 'block_content_type.delete'
@@ -36,7 +36,7 @@ block_content.type_delete:
options:
_admin_route: TRUE
-block_content.edit:
+entity.block_content.canonical:
path: '/block/{block_content}'
defaults:
_entity_form: 'block_content.edit'
@@ -45,7 +45,7 @@ block_content.edit:
requirements:
_entity_access: 'block_content.update'
-block_content.delete:
+entity.block_content.delete_form:
path: '/block/{block_content}/delete'
defaults:
_entity_form: 'block_content.delete'
@@ -63,7 +63,7 @@ block_content.type_add:
requirements:
_permission: 'administer blocks'
-block_content.type_edit:
+entity.block_content_type.edit_form:
path: '/admin/structure/block/block-content/manage/{block_content_type}'
defaults:
_entity_form: 'block_content_type.edit'
diff --git a/core/modules/block_content/src/Entity/BlockContent.php b/core/modules/block_content/src/Entity/BlockContent.php
index a7a991cc61a1..c06d4e88f943 100644
--- a/core/modules/block_content/src/Entity/BlockContent.php
+++ b/core/modules/block_content/src/Entity/BlockContent.php
@@ -38,10 +38,10 @@
* revision_table = "block_content_revision",
* data_table = "block_content_field_data",
* links = {
- * "canonical" = "block_content.edit",
- * "delete-form" = "block_content.delete",
- * "edit-form" = "block_content.edit",
- * "admin-form" = "block_content.type_edit"
+ * "canonical" = "entity.block_content.canonical",
+ * "delete-form" = "entity.block_content.delete_form",
+ * "edit-form" = "entity.block_content.canonical",
+ * "admin-form" = "entity.block_content_type.edit_form"
* },
* fieldable = TRUE,
* translatable = TRUE,
diff --git a/core/modules/block_content/src/Entity/BlockContentType.php b/core/modules/block_content/src/Entity/BlockContentType.php
index 17a358ef1865..4304b6d1a6aa 100644
--- a/core/modules/block_content/src/Entity/BlockContentType.php
+++ b/core/modules/block_content/src/Entity/BlockContentType.php
@@ -35,8 +35,8 @@
* "label" = "label"
* },
* links = {
- * "delete-form" = "block_content.type_delete",
- * "edit-form" = "block_content.type_edit"
+ * "delete-form" = "entity.block_content_type.delete_form",
+ * "edit-form" = "entity.block_content_type.edit_form"
* }
* )
*/
--
GitLab