diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Access/LinkAccessCheck.php b/core/modules/shortcut/lib/Drupal/shortcut/Access/LinkAccessCheck.php new file mode 100644 index 0000000..18d38c2 --- /dev/null +++ b/core/modules/shortcut/lib/Drupal/shortcut/Access/LinkAccessCheck.php @@ -0,0 +1,40 @@ +attributes->get('menu_link'); + $set_name = str_replace('shortcut-', '', $menu_link['menu_name']); + if ($shortcut_set = shortcut_set_load($set_name)) { + return shortcut_set_edit_access($shortcut_set); + } + } + +} diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Access/LinkDeleteAccessCheck.php b/core/modules/shortcut/lib/Drupal/shortcut/Access/LinkDeleteAccessCheck.php deleted file mode 100644 index 6fad35c..0000000 --- a/core/modules/shortcut/lib/Drupal/shortcut/Access/LinkDeleteAccessCheck.php +++ /dev/null @@ -1,37 +0,0 @@ -attributes->get('menu_link'); - $set_name = str_replace('shortcut-', '', $menu_link['menu_name']); - if ($shortcut_set = shortcut_set_load($set_name)) { - return shortcut_set_edit_access($shortcut_set); - } - } - -} diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Access/LinkEditAccessCheck.php b/core/modules/shortcut/lib/Drupal/shortcut/Access/LinkEditAccessCheck.php deleted file mode 100644 index 737b591..0000000 --- a/core/modules/shortcut/lib/Drupal/shortcut/Access/LinkEditAccessCheck.php +++ /dev/null @@ -1,38 +0,0 @@ -getRequirements()); - } - - /** - * {@inheritdoc} - */ - public function access(Route $route, Request $request) { - if ($menu_link = $request->attributes->get('menu_link')) { - $set_name = str_replace('shortcut-', '', $menu_link['menu_name']); - if ($shortcut_set = shortcut_set_load($set_name)) { - return shortcut_set_edit_access($shortcut_set); - } - } - } - -} diff --git a/core/modules/shortcut/shortcut.module b/core/modules/shortcut/shortcut.module index c23577c..b2b5d3e 100644 --- a/core/modules/shortcut/shortcut.module +++ b/core/modules/shortcut/shortcut.module @@ -125,11 +125,7 @@ function shortcut_menu() { ); $items['admin/config/user-interface/shortcut/link/%menu_link'] = array( 'title' => 'Edit shortcut', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('shortcut_link_edit', 5), - 'access callback' => 'shortcut_link_access', - 'access arguments' => array(5), - 'file' => 'shortcut.admin.inc', + 'route_name' => 'shortcut_link_edit', ); $items['admin/config/user-interface/shortcut/link/%menu_link/delete'] = array( 'title' => 'Delete shortcut', diff --git a/core/modules/shortcut/shortcut.routing.yml b/core/modules/shortcut/shortcut.routing.yml index e6bb718..fd4017e 100644 --- a/core/modules/shortcut/shortcut.routing.yml +++ b/core/modules/shortcut/shortcut.routing.yml @@ -5,6 +5,13 @@ shortcut_link_delete: requirements: _access_shortcut_link_delete: 'TRUE' +shortcut_link_edit: + pattern: '/admin/config/user-interface/shortcut/link/{menu_link}' + defaults: + _form: 'Drupal\shortcut\Form\LinkEdit' + requirements: + _access_shortcut_link_edit: 'TRUE' + shortcut_set_delete: pattern: '/admin/config/user-interface/shortcut/manage/{shortcut}/delete' defaults: