Commit 1d727ae1 authored by webchick's avatar webchick

Issue #2314855 by Crell: Standardize block entity route names.

parent 37e7f6a4
......@@ -92,7 +92,7 @@
* Some routes have placeholders in them, and these can also be defined in a
* module_name.routing.yml file, as in this example from the Block module:
* @code
* block.admin_edit:
* entity.block.edit_form:
* path: '/admin/structure/block/manage/{block}'
* defaults:
* _entity_form: 'block.default'
......@@ -240,7 +240,7 @@
* @code
* block_configure:
* title: 'Configure block'
* route_name: 'block.admin_edit'
* route_name: 'entity.block.edit_form'
* group: 'block'
* @endcode
* Some notes:
......
block_configure:
title: 'Configure block'
route_name: 'block.admin_edit'
route_name: 'entity.block.edit_form'
group: 'block'
block.admin_edit:
entity.block.edit_form:
title: 'Configure block'
route_name: block.admin_edit
base_route: block.admin_edit
route_name: entity.block.edit_form
base_route: entity.block.edit_form
# Per theme block layout pages.
block.admin_display:
......
......@@ -9,7 +9,7 @@ block.admin_demo:
options:
_admin_route: FALSE
block.admin_block_delete:
entity.block.delete_form:
path: '/admin/structure/block/manage/{block}/delete'
defaults:
_entity_form: 'block.delete'
......@@ -17,7 +17,7 @@ block.admin_block_delete:
requirements:
_permission: 'administer blocks'
block.admin_edit:
entity.block.edit_form:
path: '/admin/structure/block/manage/{block}'
defaults:
_entity_form: 'block.default'
......
......@@ -36,8 +36,8 @@
* "id" = "id"
* },
* links = {
* "delete-form" = "block.admin_block_delete",
* "edit-form" = "block.admin_edit"
* "delete-form" = "entity.block.delete_form",
* "edit-form" = "entity.block.edit_form"
* }
* )
*/
......
......@@ -56,7 +56,7 @@ public function setUp() {
* Tests the admin edit local task.
*/
public function testBlockAdminLocalTasks() {
$this->assertLocalTasks('block.admin_edit', array(array('block.admin_edit')));
$this->assertLocalTasks('entity.block.edit_form', array(array('entity.block.edit_form')));
}
/**
......
......@@ -73,7 +73,7 @@ function language_help($route_name, RouteMatchInterface $route_match) {
$output = '<p>' . t('Changing the selected language here (and leaving this option as the last among the detection and selection options) is the easiest way to change the fallback language for the website, if you need to change how your site works by default (e.g., when using an empty path prefix or using the default domain). <a href="!admin-change-language">Changing the site\'s default language</a> itself might have other undesired side effects.', array('!admin-change-language' => \Drupal::url('language.admin_overview'))) . '</p>';
return $output;
case 'block.admin_edit':
case 'entity.block.edit_form':
if (($block = $route_match->getParameter('block')) && $block->get('plugin') == 'language_block:language_interface') {
return '<p>' . t('With multiple languages added, registered users can select their preferred language and authors can assign a specific language to content.') . '</p>';
}
......
......@@ -352,7 +352,7 @@
* the @link menu Menu and routing @endlink topic for more information. Here
* is a typical entry, for the block configure form:
* @code
* block.admin_edit:
* entity.block.edit_form:
* path: '/admin/structure/block/manage/{block}'
* defaults:
* _entity_form: 'block.default'
......
......@@ -135,7 +135,7 @@ function system_help($route_name, RouteMatchInterface $route_match) {
case 'system.modules_uninstall':
return '<p>' . t('The uninstall process removes all data related to a module.') . '</p>';
case 'block.admin_edit':
case 'entity.block.edit_form':
if (($block = $route_match->getParameter('block')) && $block->get('plugin') == 'system_powered_by_block') {
return '<p>' . t('The <em>Powered by Drupal</em> block is an optional link to the home page of the Drupal project. While there is absolutely no requirement that sites feature this link, it may be used to show support for Drupal.') . '</p>';
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment