diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module index bd65f4f..d50f2c6 100644 --- a/core/modules/aggregator/aggregator.module +++ b/core/modules/aggregator/aggregator.module @@ -214,19 +214,13 @@ function aggregator_menu() { ); $items['aggregator/sources/%aggregator_feed/configure'] = array( 'title' => 'Configure', - 'page callback' => 'entity_get_form', - 'page arguments' => array(2), - 'access arguments' => array('administer news feeds'), 'type' => MENU_LOCAL_TASK, 'weight' => 10, - 'file' => 'aggregator.admin.inc', + 'route_name' => 'aggregator_feed_configure', ); $items['admin/config/services/aggregator/edit/feed/%aggregator_feed'] = array( 'title' => 'Edit feed', - 'page callback' => 'entity_get_form', - 'page arguments' => array(6), - 'access arguments' => array('administer news feeds'), - 'file' => 'aggregator.admin.inc', + 'route_name' => 'aggregator_feed_edit', ); $items['admin/config/services/aggregator/delete/feed/%aggregator_feed'] = array( 'title' => 'Delete feed', diff --git a/core/modules/aggregator/aggregator.routing.yml b/core/modules/aggregator/aggregator.routing.yml index a285eec..3c657bf 100644 --- a/core/modules/aggregator/aggregator.routing.yml +++ b/core/modules/aggregator/aggregator.routing.yml @@ -53,3 +53,17 @@ aggregator_page_last: _controller: '\Drupal\aggregator\Routing\AggregatorController::pageLast' requirements: _permission: 'access news feeds' + +aggregator_feed_configure: + pattern: 'aggregator/sources/{aggregator_feed}/configure' + defaults: + _entity_form: 'aggregator_feed.default' + requirements: + _permission: 'administer news feeds' + +aggregator_feed_edit: + pattern: 'admin/config/services/aggregator/edit/feed/{aggregator_feed}' + defaults: + _entity_form: 'aggregator_feed.default' + requirements: + _permission: 'administer news feeds' diff --git a/core/modules/entity/entity.routing.yml b/core/modules/entity/entity.routing.yml new file mode 100644 index 0000000..e69de29 diff --git a/core/modules/menu/menu.module b/core/modules/menu/menu.module index 93c2ed8..1492559 100644 --- a/core/modules/menu/menu.module +++ b/core/modules/menu/menu.module @@ -126,9 +126,7 @@ function menu_menu() { ); $items['admin/structure/menu/item/%menu_link/edit'] = array( 'title' => 'Edit menu link', - 'page callback' => 'entity_get_form', - 'page arguments' => array(4), - 'access arguments' => array('administer menu'), + 'route_name' => 'menu_link_edit', ); $items['admin/structure/menu/item/%menu_link/reset'] = array( 'title' => 'Reset menu link', diff --git a/core/modules/menu/menu.routing.yml b/core/modules/menu/menu.routing.yml index aafe5c3..c9a170f 100644 --- a/core/modules/menu/menu.routing.yml +++ b/core/modules/menu/menu.routing.yml @@ -25,3 +25,10 @@ menu_delete_menu: _form: '\Drupal\menu\Form\MenuDeleteMenuForm' requirements: _access_menu_delete_menu: 'TRUE' + +menu_link_edit: + pattern: 'admin/structure/menu/item/{menu_link}/edit' + defaults: + _entity_form: 'menu_link.default' + requirements: + _permission: 'administer menu' diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module index 2557008..4f7fc6e 100644 --- a/core/modules/taxonomy/taxonomy.module +++ b/core/modules/taxonomy/taxonomy.module @@ -266,16 +266,10 @@ function taxonomy_menu() { ); $items['taxonomy/term/%taxonomy_term/edit'] = array( 'title' => 'Edit', - 'page callback' => 'entity_get_form', - // Pass a NULL argument to ensure that additional path components are not - // passed to taxonomy_term_form() as the vocabulary machine name argument. - 'page arguments' => array(2), - 'access callback' => 'entity_page_access', - 'access arguments' => array(2, 'update'), + 'route_name' => 'taxonomy_term_edit', 'type' => MENU_LOCAL_TASK, 'context' => MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE, 'weight' => 10, - 'file' => 'taxonomy.admin.inc', ); $items['taxonomy/term/%taxonomy_term/delete'] = array( 'title' => 'Delete', @@ -323,12 +317,8 @@ function taxonomy_menu() { ); $items['admin/structure/taxonomy/manage/%taxonomy_vocabulary/edit'] = array( 'title' => 'Edit', - 'page callback' => 'entity_get_form', - 'page arguments' => array(4), - 'access callback' => 'entity_page_access', - 'access arguments' => array(4, 'update'), 'type' => MENU_LOCAL_TASK, - 'file' => 'taxonomy.admin.inc', + 'route_name' => 'taxonomy_vocabulary_edit', ); $items['admin/structure/taxonomy/manage/%taxonomy_vocabulary/add'] = array( diff --git a/core/modules/taxonomy/taxonomy.routing.yml b/core/modules/taxonomy/taxonomy.routing.yml new file mode 100644 index 0000000..5dc2ec6 --- /dev/null +++ b/core/modules/taxonomy/taxonomy.routing.yml @@ -0,0 +1,13 @@ +taxonomy_term_edit: + pattern: 'taxonomy/term/{taxonomy_term}/edit' + defaults: + _entity_form: 'taxonomy_term.default' + requirements: + _entity_access: 'taxonomy_term.update' + +taxonomy_vocabulary_edit: + pattern: 'admin/structure/taxonomy/manage/{taxonomy_vocabulary}/edit' + defaults: + _entity_form: 'taxonomy_vocabulary.default' + requirements: + _entity_access: 'taxonomy_vocabulary.update' diff --git a/core/modules/user/user.module b/core/modules/user/user.module index 322311f..4bec587 100644 --- a/core/modules/user/user.module +++ b/core/modules/user/user.module @@ -1029,12 +1029,8 @@ function user_menu() { ); $items['user/%user/edit'] = array( 'title' => 'Edit', - 'page callback' => 'entity_get_form', - 'page arguments' => array(1, 'profile'), - 'access callback' => 'entity_page_access', - 'access arguments' => array(1, 'update'), + 'route_name' => 'user_edit', 'type' => MENU_LOCAL_TASK, - 'file' => 'user.pages.inc', ); return $items; } diff --git a/core/modules/user/user.routing.yml b/core/modules/user/user.routing.yml index 409b033..b82644a 100644 --- a/core/modules/user/user.routing.yml +++ b/core/modules/user/user.routing.yml @@ -54,3 +54,10 @@ user_role_delete: _form: '\Drupal\user\Form\UserRoleDelete' requirements: _entity_access: user_role.delete + +user_edit: + pattern: '/user/{user}/edit' + defaults: + _entity_form: 'user.profile' + requirements: + _entity_access: 'user.update'