summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwebchick2013-10-08 06:07:56 (GMT)
committerwebchick2013-10-08 06:07:56 (GMT)
commit6302d0e0203f189ec8a4c87002113f5d545e334a (patch)
tree826739c1eb4042607b13a563185a72bf6661cf2c
parentae7c20c7b5f1d65e66592328946a27eed808c434 (diff)
Issue #2089511 by RoSk0, tim.plunkett: Convert info file configure link to route name.
-rw-r--r--core/modules/action/action.info.yml2
-rw-r--r--core/modules/aggregator/aggregator.info.yml2
-rw-r--r--core/modules/ban/ban.info.yml2
-rw-r--r--core/modules/block/block.info.yml2
-rw-r--r--core/modules/block/custom_block/custom_block.info.yml2
-rw-r--r--core/modules/book/book.info.yml2
-rw-r--r--core/modules/comment/comment.info.yml2
-rw-r--r--core/modules/config/config.info.yml2
-rw-r--r--core/modules/contact/contact.info.yml2
-rw-r--r--core/modules/content_translation/content_translation.info.yml2
-rw-r--r--core/modules/editor/editor.info.yml2
-rw-r--r--core/modules/filter/filter.info.yml2
-rw-r--r--core/modules/forum/forum.info.yml2
-rw-r--r--core/modules/image/image.info.yml2
-rw-r--r--core/modules/language/language.info.yml2
-rw-r--r--core/modules/menu/menu.info.yml2
-rw-r--r--core/modules/node/node.info.yml2
-rw-r--r--core/modules/path/path.info.yml2
-rw-r--r--core/modules/picture/picture.info.yml2
-rw-r--r--core/modules/search/search.info.yml2
-rw-r--r--core/modules/shortcut/shortcut.info.yml2
-rw-r--r--core/modules/simpletest/simpletest.info.yml2
-rw-r--r--core/modules/statistics/statistics.info.yml2
-rw-r--r--core/modules/syslog/syslog.info.yml2
-rw-r--r--core/modules/system/lib/Drupal/system/Form/ModulesListForm.php21
-rw-r--r--core/modules/system/system.info.yml2
-rw-r--r--core/modules/taxonomy/taxonomy.info.yml2
-rw-r--r--core/modules/toolbar/toolbar.info.yml1
-rw-r--r--core/modules/update/update.info.yml2
-rw-r--r--core/modules/user/user.info.yml2
-rw-r--r--core/modules/views_ui/views_ui.info.yml2
31 files changed, 45 insertions, 35 deletions
diff --git a/core/modules/action/action.info.yml b/core/modules/action/action.info.yml
index 8d05826..e99997d 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 fecc548..1a690ee 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 90581a7..ba6300d 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 f61bb76..47501ef 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 1ddf936..692648f 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 a19e9a0..5c9eab9 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 e2f0394..c841981 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 f69027b..88821ce 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 bd15fe1..647bc15 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 8b1ccf3..ff744ad 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 b8e4820..47ac411 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 a340ceb..888f545 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 c136ae4..43e660f 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 33af07e..8e2d5d7 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 e029450..c1cf7ff 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 dccb199..b163994 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 777ec9e..181830e 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 59ac9bf..ba2c759 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 34a4d12..456d8a7 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 ece0660..4675b0b 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 9a88215..a5dc32d 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 b7b1a6d..232680e 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 f1b7475..6582bec 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 d756b86..1d8dc8f 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 28836dd..dadb227 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\Extension\ModuleHandlerInterface;
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 @@ class ModulesListForm extends FormBase {
* 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 @@ class ModulesListForm extends FormBase {
// 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 213c6ec..1f2a064 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 4ed4e26..88de323 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 253837c..269f7ec 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 5a10f94..ae94a4c 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 52c4d6f..45a421a 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 21edcab..0230b6e 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