diff --git a/core/modules/action/action.info.yml b/core/modules/action/action.info.yml index 8d0582633ebcf21baf6c51037647011c86225589..e99997d63664c6d23d27a34fba8f058ddb00424d 100644 --- a/core/modules/action/action.info.yml +++ b/core/modules/action/action.info.yml @@ -4,4 +4,4 @@ description: 'Perform tasks on specific events triggered within the system.' package: Core version: VERSION core: 8.x -configure: admin/config/system/actions +configure: action.admin diff --git a/core/modules/aggregator/aggregator.info.yml b/core/modules/aggregator/aggregator.info.yml index fecc548f580816c112607ed7f80550596441af01..1a690eeb0ffd64307599ec3adc1374808ba41811 100644 --- a/core/modules/aggregator/aggregator.info.yml +++ b/core/modules/aggregator/aggregator.info.yml @@ -4,6 +4,6 @@ description: 'Aggregates syndicated content (RSS, RDF, and Atom feeds) from exte package: Core version: VERSION core: 8.x -configure: admin/config/services/aggregator/settings +configure: aggregator.admin_settings dependencies: - file diff --git a/core/modules/ban/ban.info.yml b/core/modules/ban/ban.info.yml index 90581a72e0425b65153638818d8cbb4a4f894ff9..ba6300de1c20a284849cd67e853289a8598a0a53 100644 --- a/core/modules/ban/ban.info.yml +++ b/core/modules/ban/ban.info.yml @@ -4,4 +4,4 @@ description: 'Enables banning of IP addresses.' package: Core version: VERSION core: 8.x -configure: admin/config/people/ban +configure: ban.admin_page diff --git a/core/modules/block/block.info.yml b/core/modules/block/block.info.yml index f61bb769de8a961e82257d77f41286aada47d78e..47501efb17f335e12507f8f018f4fca20807ed23 100644 --- a/core/modules/block/block.info.yml +++ b/core/modules/block/block.info.yml @@ -4,4 +4,4 @@ description: 'Controls the visual building blocks a page is constructed with. Bl package: Core version: VERSION core: 8.x -configure: admin/structure/block +configure: block.admin_display diff --git a/core/modules/block/custom_block/custom_block.info.yml b/core/modules/block/custom_block/custom_block.info.yml index 1ddf93661409975665dfa961540d6a16c898214e..692648fded23b1a1db84c1d51cfbd50c635d4825 100644 --- a/core/modules/block/custom_block/custom_block.info.yml +++ b/core/modules/block/custom_block/custom_block.info.yml @@ -7,4 +7,4 @@ core: 8.x dependencies: - block - text -configure: admin/structure/block/custom-blocks +configure: custom_block.list diff --git a/core/modules/book/book.info.yml b/core/modules/book/book.info.yml index a19e9a0bdbc53b1fb47145dadc13e40d2dabe7d2..5c9eab98273dc61fdc1f031c13c897688d2dfe17 100644 --- a/core/modules/book/book.info.yml +++ b/core/modules/book/book.info.yml @@ -7,4 +7,4 @@ core: 8.x dependencies: - menu_link - node -configure: admin/structure/book/settings +configure: book.settings diff --git a/core/modules/comment/comment.info.yml b/core/modules/comment/comment.info.yml index e2f03942ff046d4c039289248ac45bd16cc048b4..c8419818dff251779be6e81aed81beb38c420926 100644 --- a/core/modules/comment/comment.info.yml +++ b/core/modules/comment/comment.info.yml @@ -7,4 +7,4 @@ core: 8.x dependencies: - datetime - text -configure: admin/content/comment +configure: comment.admin diff --git a/core/modules/config/config.info.yml b/core/modules/config/config.info.yml index f69027b68eacc1ad9713a4973b5a1f63b7505a99..88821cea25f91c918060a1356aac84e067543dbe 100644 --- a/core/modules/config/config.info.yml +++ b/core/modules/config/config.info.yml @@ -4,4 +4,4 @@ description: 'Allows administrators to manage configuration changes.' package: Core version: VERSION core: 8.x -configure: admin/config/development/configuration/sync +configure: config.sync diff --git a/core/modules/contact/contact.info.yml b/core/modules/contact/contact.info.yml index bd15fe1b24271fc82dece339cc05230360994ad2..647bc156fa96d1714e0ad144f152c191f2b93be4 100644 --- a/core/modules/contact/contact.info.yml +++ b/core/modules/contact/contact.info.yml @@ -4,4 +4,4 @@ description: 'Enables the use of both personal and site-wide contact forms.' package: Core version: VERSION core: 8.x -configure: admin/structure/contact +configure: contact.category_list diff --git a/core/modules/content_translation/content_translation.info.yml b/core/modules/content_translation/content_translation.info.yml index 8b1ccf33413c6191dda8e929579aa7c29a51e792..ff744adbad657ff6a765f091778338998052d1a7 100644 --- a/core/modules/content_translation/content_translation.info.yml +++ b/core/modules/content_translation/content_translation.info.yml @@ -6,4 +6,4 @@ dependencies: package: Multilingual version: VERSION core: 8.x -configure: admin/config/regional/content-language +configure: language.content_settings_page diff --git a/core/modules/editor/editor.info.yml b/core/modules/editor/editor.info.yml index b8e48201e7a8c3cfec254be78b3457121039fdbd..47ac411a570f87d748928ee4b6700061082a8ccb 100644 --- a/core/modules/editor/editor.info.yml +++ b/core/modules/editor/editor.info.yml @@ -6,4 +6,4 @@ version: VERSION core: 8.x dependencies: - filter -configure: admin/config/content/formats +configure: filter.admin_overview diff --git a/core/modules/filter/filter.info.yml b/core/modules/filter/filter.info.yml index a340cebaddec7bb87d01d68fa0d76a4162f4bcc9..888f54559763f3b3233e45036ccfbcc32abc3445 100644 --- a/core/modules/filter/filter.info.yml +++ b/core/modules/filter/filter.info.yml @@ -5,4 +5,4 @@ package: Core version: VERSION core: 8.x required: true -configure: admin/config/content/formats +configure: filter.admin_overview diff --git a/core/modules/forum/forum.info.yml b/core/modules/forum/forum.info.yml index c136ae423ec6ee7867d8508bbeb0a27b4ecef833..43e660f7d2f77ee70bc38c8bfff0ec1449dd9e5c 100644 --- a/core/modules/forum/forum.info.yml +++ b/core/modules/forum/forum.info.yml @@ -10,4 +10,4 @@ dependencies: package: Core version: VERSION core: 8.x -configure: admin/structure/forum +configure: forum.overview diff --git a/core/modules/image/image.info.yml b/core/modules/image/image.info.yml index 33af07ebf8db6783f7da2b531b3b3e7cec7d2102..8e2d5d79a8566697f83e85885282ccb3b3e853d3 100644 --- a/core/modules/image/image.info.yml +++ b/core/modules/image/image.info.yml @@ -6,4 +6,4 @@ version: VERSION core: 8.x dependencies: - file -configure: admin/config/media/image-styles +configure: image.style_list diff --git a/core/modules/language/language.info.yml b/core/modules/language/language.info.yml index e0294507dab6a75315c842142a575cf4b2ef52fc..c1cf7ffbd76fe68c2af048a7099fb48d6ae66392 100644 --- a/core/modules/language/language.info.yml +++ b/core/modules/language/language.info.yml @@ -4,4 +4,4 @@ description: 'Allows users to configure languages and apply them to content.' package: Multilingual version: VERSION core: 8.x -configure: admin/config/regional/language +configure: language.admin_overview diff --git a/core/modules/menu/menu.info.yml b/core/modules/menu/menu.info.yml index dccb199ccd6df65b82d83cb4c8a5aa0bf5d85c05..b163994a25ccbc15d4e7cd677a78241c583dd1e3 100644 --- a/core/modules/menu/menu.info.yml +++ b/core/modules/menu/menu.info.yml @@ -4,6 +4,6 @@ description: 'Allows administrators to customize the site navigation menu.' package: Core version: VERSION core: 8.x -configure: admin/structure/menu +configure: menu.overview_page dependencies: - menu_link diff --git a/core/modules/node/node.info.yml b/core/modules/node/node.info.yml index 777ec9ed79a88be46e4a2ad0a37ae572c5770c7c..181830ebd5c3dd024a471a18187bbdfdb47094da 100644 --- a/core/modules/node/node.info.yml +++ b/core/modules/node/node.info.yml @@ -4,4 +4,4 @@ description: 'Allows content to be submitted to the site and displayed on pages. package: Core version: VERSION core: 8.x -configure: admin/structure/types +configure: node.overview_types diff --git a/core/modules/path/path.info.yml b/core/modules/path/path.info.yml index 59ac9bf59754f7514d32ad89bef5f9f6f3a352b5..ba2c759c992108bd3741e0a6e12edaac80623308 100644 --- a/core/modules/path/path.info.yml +++ b/core/modules/path/path.info.yml @@ -4,4 +4,4 @@ description: 'Allows users to rename URLs.' package: Core version: VERSION core: 8.x -configure: admin/config/search/path +configure: path.admin_overview diff --git a/core/modules/picture/picture.info.yml b/core/modules/picture/picture.info.yml index 34a4d128436ff648002003fae1486a47f2723c6a..456d8a7b151937c48f5101761f7287677fe513a9 100644 --- a/core/modules/picture/picture.info.yml +++ b/core/modules/picture/picture.info.yml @@ -7,4 +7,4 @@ core: 8.x dependencies: - breakpoint - image -configure: admin/config/media/picturemapping +configure: picture.mapping_page diff --git a/core/modules/search/search.info.yml b/core/modules/search/search.info.yml index ece0660a7cad9d691d69b8434f193ad868da66a3..4675b0badb919497a5f612087df685a27e229d38 100644 --- a/core/modules/search/search.info.yml +++ b/core/modules/search/search.info.yml @@ -4,4 +4,4 @@ description: 'Enables site-wide keyword searching.' package: Core version: VERSION core: 8.x -configure: admin/config/search/settings +configure: search.settings diff --git a/core/modules/shortcut/shortcut.info.yml b/core/modules/shortcut/shortcut.info.yml index 9a88215636f3be4be0d7403f67e7e5358cfc01e0..a5dc32d1982729c86e54c9c3ac828c303554054f 100644 --- a/core/modules/shortcut/shortcut.info.yml +++ b/core/modules/shortcut/shortcut.info.yml @@ -6,4 +6,4 @@ version: VERSION core: 8.x dependencies: - menu_link -configure: admin/config/user-interface/shortcut +configure: shortcut.set_admin diff --git a/core/modules/simpletest/simpletest.info.yml b/core/modules/simpletest/simpletest.info.yml index b7b1a6dd95f7a2a83678045ada411da798697915..232680e7cf0b6993485a8da538c7f3428bc3944f 100644 --- a/core/modules/simpletest/simpletest.info.yml +++ b/core/modules/simpletest/simpletest.info.yml @@ -4,4 +4,4 @@ description: 'Provides a framework for unit and functional testing.' package: Core version: VERSION core: 8.x -configure: admin/config/development/testing/settings +configure: simpletest.settings diff --git a/core/modules/statistics/statistics.info.yml b/core/modules/statistics/statistics.info.yml index f1b7475b6088a22ece251d13184e7b456a8bd022..6582bec1c742cdcc3267668911db759f7ee4ee77 100644 --- a/core/modules/statistics/statistics.info.yml +++ b/core/modules/statistics/statistics.info.yml @@ -4,4 +4,4 @@ description: 'Logs content statistics for your site.' package: Core version: VERSION core: 8.x -configure: admin/config/system/statistics +configure: statistics.settings diff --git a/core/modules/syslog/syslog.info.yml b/core/modules/syslog/syslog.info.yml index d756b86047a1a61ca71bead389e1fe7924db143b..1d8dc8f1b690dc2c78322645a9c1b5b37c3c0b91 100644 --- a/core/modules/syslog/syslog.info.yml +++ b/core/modules/syslog/syslog.info.yml @@ -4,4 +4,4 @@ description: 'Logs and records system events to syslog.' package: Core version: VERSION core: 8.x -configure: admin/config/development/logging +configure: system.logging_settings diff --git a/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php b/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php index 28836dd32a7644ed38c87857212ea6d3afa83c27..dadb2278ed363a5fb21cf64365627ae789e6ab98 100644 --- a/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php +++ b/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php @@ -12,6 +12,7 @@ use Drupal\Core\Form\FormBase; use Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface; use Symfony\Component\DependencyInjection\ContainerInterface; +use Drupal\Core\Access\AccessManager; /** * Provides module installation interface. @@ -43,7 +44,8 @@ class ModulesListForm extends FormBase { public static function create(ContainerInterface $container) { return new static( $container->get('module_handler'), - $container->get('keyvalue.expirable')->get('module_list') + $container->get('keyvalue.expirable')->get('module_list'), + $container->get('access_manager') ); } @@ -54,10 +56,13 @@ public static function create(ContainerInterface $container) { * The module handler. * @param \Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface $key_value_expirable * The key value expirable factory. + * @param \Drupal\Core\Access\AccessManager $access_manager + * Access manager. */ - public function __construct(ModuleHandlerInterface $module_handler, KeyValueStoreExpirableInterface $key_value_expirable) { + public function __construct(ModuleHandlerInterface $module_handler, KeyValueStoreExpirableInterface $key_value_expirable, AccessManager $access_manager) { $this->moduleHandler = $module_handler; $this->keyValueExpirable = $key_value_expirable; + $this->accessManager = $access_manager; } /** @@ -193,12 +198,18 @@ protected function buildRow(array $modules, $module, $distribution) { // Generate link for module's configuration page, if it has one. $row['links']['configure'] = array(); if ($module->status && isset($module->info['configure'])) { - if (($configure = menu_get_item($module->info['configure'])) && $configure['access']) { + if ($this->accessManager->checkNamedRoute($module->info['configure'])) { + $item = menu_get_item(trim($this->url($module->info['configure']), '/')); $row['links']['configure'] = array( '#type' => 'link', '#title' => $this->t('Configure'), - '#href' => $configure['href'], - '#options' => array('attributes' => array('class' => array('module-link', 'module-link-configure'), 'title' => $configure['description'])), + '#route_name' => $module->info['configure'], + '#options' => array( + 'attributes' => array( + 'class' => array('module-link', 'module-link-configure'), + 'title' => $item['description'], + ), + ), ); } } diff --git a/core/modules/system/system.info.yml b/core/modules/system/system.info.yml index 213c6ec2b75ee3ae4b1706ab1ae1499d4d374530..1f2a0644845ebdb2809b7c98d7ebca919999ab4f 100644 --- a/core/modules/system/system.info.yml +++ b/core/modules/system/system.info.yml @@ -5,4 +5,4 @@ package: Core version: VERSION core: 8.x required: true -configure: admin/config/system +configure: system.admin_config_system diff --git a/core/modules/taxonomy/taxonomy.info.yml b/core/modules/taxonomy/taxonomy.info.yml index 4ed4e2627a58d716ecd48142c19e7aab16b48d4f..88de323ffb15a060f1166dae8c403011ce8ccbff 100644 --- a/core/modules/taxonomy/taxonomy.info.yml +++ b/core/modules/taxonomy/taxonomy.info.yml @@ -6,4 +6,4 @@ version: VERSION core: 8.x dependencies: - options -configure: admin/structure/taxonomy +configure: taxonomy.vocabulary_list diff --git a/core/modules/toolbar/toolbar.info.yml b/core/modules/toolbar/toolbar.info.yml index 253837c25680bbdee9dcc5db1a2579f4af1b7e06..269f7eccf084b9cb3e4951057a2b8966dc4c6081 100644 --- a/core/modules/toolbar/toolbar.info.yml +++ b/core/modules/toolbar/toolbar.info.yml @@ -7,4 +7,3 @@ version: VERSION dependencies: - breakpoint - menu_link -configure: admin/structure/toolbar diff --git a/core/modules/update/update.info.yml b/core/modules/update/update.info.yml index 5a10f947ac43c916342393a27a7e406f8af904de..ae94a4c6fd6516c0d4de6de48d09edd17a8b5668 100644 --- a/core/modules/update/update.info.yml +++ b/core/modules/update/update.info.yml @@ -4,6 +4,6 @@ description: 'Checks for available updates, and can securely install or update m version: VERSION package: Core core: 8.x -configure: admin/reports/updates/settings +configure: update.settings dependencies: - file diff --git a/core/modules/user/user.info.yml b/core/modules/user/user.info.yml index 52c4d6ffd2e2cfd8d9ef11f8db0f895a8e826a00..45a421a5ade5fa769e9088de5c68340224cfed51 100644 --- a/core/modules/user/user.info.yml +++ b/core/modules/user/user.info.yml @@ -5,4 +5,4 @@ package: Core version: VERSION core: 8.x required: true -configure: admin/config/people +configure: user.admin_index diff --git a/core/modules/views_ui/views_ui.info.yml b/core/modules/views_ui/views_ui.info.yml index 21edcabc562416d23d8b02294d10a9501f3fb7b0..0230b6eaf6ce8003d97d6b64cd2e1b7d756969ef 100644 --- a/core/modules/views_ui/views_ui.info.yml +++ b/core/modules/views_ui/views_ui.info.yml @@ -4,6 +4,6 @@ description: 'Administrative interface for Views.' package: Core version: VERSION core: 8.x -configure: admin/structure/views +configure: views_ui.list dependencies: - views