' . t('The book module offers a means to organize a collection of related content pages, collectively known as a book. When viewed, this content automatically displays links to adjacent book pages, providing a simple navigation system for creating and reviewing structured content.') . '
'; - case 'book.outline': + case 'entity.node.book_outline_form': return '' . t('The outline feature allows you to include pages in the Book hierarchy, as well as move them within the hierarchy or to reorder an entire book.', array('!book' => \Drupal::url('book.render'), '!book-admin' => \Drupal::url('book.admin'))) . '
'; } } @@ -90,8 +90,8 @@ function book_entity_type_build(array &$entity_types) { /** @var $entity_types \Drupal\Core\Entity\EntityTypeInterface[] */ $entity_types['node'] ->setFormClass('book_outline', 'Drupal\book\Form\BookOutlineForm') - ->setLinkTemplate('book-outline-form', 'book.outline') - ->setLinkTemplate('book-remove-form', 'book.remove'); + ->setLinkTemplate('book-outline-form', 'entity.node.book_outline_form') + ->setLinkTemplate('book-remove-form', 'entity.node.book_remove_form'); } /** diff --git a/core/modules/book/book.routing.yml b/core/modules/book/book.routing.yml index c365d01..13c0f10 100644 --- a/core/modules/book/book.routing.yml +++ b/core/modules/book/book.routing.yml @@ -30,7 +30,7 @@ book.export: _permission: 'access printer-friendly version' _entity_access: 'node.view' -book.outline: +entity.node.book_outline_form: path: '/node/{node}/outline' defaults: _entity_form: 'node.book_outline' @@ -51,7 +51,7 @@ book.admin_edit: _entity_access: 'node.view' node: \d+ -book.remove: +entity.node.book_remove_form: path: '/node/{node}/outline/remove' defaults: _form: '\Drupal\book\Form\BookRemoveForm' diff --git a/core/modules/book/tests/src/Unit/Menu/BookLocalTasksTest.php b/core/modules/book/tests/src/Unit/Menu/BookLocalTasksTest.php index 2e58f85..1702855 100644 --- a/core/modules/book/tests/src/Unit/Menu/BookLocalTasksTest.php +++ b/core/modules/book/tests/src/Unit/Menu/BookLocalTasksTest.php @@ -53,7 +53,7 @@ public function getBookAdminRoutes() { */ public function testBookNodeLocalTasks($route) { $this->assertLocalTasks($route, array( - 0 => array('book.outline', 'entity.node.canonical', 'entity.node.edit_form', 'entity.node.delete_form', 'entity.node.version_history',), + 0 => array('entity.node.book_outline_form', 'entity.node.canonical', 'entity.node.edit_form', 'entity.node.delete_form', 'entity.node.version_history',), )); } @@ -63,7 +63,7 @@ public function testBookNodeLocalTasks($route) { public function getBookNodeRoutes() { return array( array('entity.node.canonical'), - array('book.outline'), + array('entity.node.book_outline_form'), ); } diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module index 1b15b3e..ac8c371 100644 --- a/core/modules/forum/forum.module +++ b/core/modules/forum/forum.module @@ -166,8 +166,8 @@ function forum_entity_type_build(array &$entity_types) { $entity_types['taxonomy_term'] ->setFormClass('forum', 'Drupal\forum\Form\ForumForm') ->setFormClass('container', 'Drupal\forum\Form\ContainerForm') - ->setLinkTemplate('forum-delete-form', 'forum.delete') - ->setLinkTemplate('forum-edit-form', 'forum.edit_forum'); + ->setLinkTemplate('forum-delete-form', 'entity.taxonomy_term.forum_delete_form') + ->setLinkTemplate('forum-edit-form', 'entity.taxonomy_term.forum_edit_form'); } /** diff --git a/core/modules/forum/forum.routing.yml b/core/modules/forum/forum.routing.yml index aa21336..ac9d35d 100644 --- a/core/modules/forum/forum.routing.yml +++ b/core/modules/forum/forum.routing.yml @@ -1,4 +1,4 @@ -forum.delete: +entity.taxonomy_term.forum_delete_form: path: '/admin/structure/forum/delete/forum/{taxonomy_term}' defaults: _form: '\Drupal\forum\Form\DeleteForm' @@ -54,7 +54,7 @@ forum.edit_container: requirements: _permission: 'administer forums' -forum.edit_forum: +entity.taxonomy_term.forum_edit_form: path: '/admin/structure/forum/edit/forum/{taxonomy_term}' defaults: _entity_form: 'taxonomy_term.forum' diff --git a/core/modules/forum/src/Form/ForumForm.php b/core/modules/forum/src/Form/ForumForm.php index 6a8131a..efe962c 100644 --- a/core/modules/forum/src/Form/ForumForm.php +++ b/core/modules/forum/src/Form/ForumForm.php @@ -80,7 +80,7 @@ public function save(array $form, FormStateInterface $form_state) { $term_storage = $this->entityManager->getStorage('taxonomy_term'); $status = $term_storage->save($term); - $route_name = $this->urlStub == 'container' ? 'forum.edit_container' : 'forum.edit_forum'; + $route_name = $this->urlStub == 'container' ? 'forum.edit_container' : 'entity.taxonomy_term.forum_edit_form'; $route_parameters = ['taxonomy_term' => $term->id()]; $link = $this->l($this->t('Edit'), new Url($route_name, $route_parameters)); switch ($status) { diff --git a/core/modules/forum/src/Form/Overview.php b/core/modules/forum/src/Form/Overview.php index eb05b3a..a8dbdf3 100644 --- a/core/modules/forum/src/Form/Overview.php +++ b/core/modules/forum/src/Form/Overview.php @@ -76,7 +76,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { } else { $form['terms'][$key]['operations']['#links']['edit']['title'] = $this->t('edit forum'); - $form['terms'][$key]['operations']['#links']['edit']['route_name'] = 'forum.edit_forum'; + $form['terms'][$key]['operations']['#links']['edit']['route_name'] = 'entity.taxonomy_term.forum_edit_form'; // We don't want the redirect from the link so we can redirect the // delete action. unset($form['terms'][$key]['operations']['#links']['edit']['query']['destination']);