diff --git a/composer.json b/composer.json
index b08249dbc4898ab77d62c4ce70ec6f0dc6325986..5bd1c034404904d667be9218068568642f77fbb1 100644
--- a/composer.json
+++ b/composer.json
@@ -71,7 +71,7 @@
"drupal-composer/drupal-scaffold": "^2.0.1",
"drupal/address": "1.1",
"drupal/addtocalendar": "3.1",
- "drupal/admin_toolbar": "1.24",
+ "drupal/admin_toolbar": "1.26",
"drupal/administerusersbyrole": "2.0-alpha6",
"drupal/allowed_formats": "1.1",
"drupal/better_exposed_filters": "3.0-alpha4",
diff --git a/composer.lock b/composer.lock
index 7874c5740d57e6c254969c7ecb3113ac4db7f8b7..af63af7d52da0f36cd857c55a3767f7c0932c343 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "content-hash": "43369c4e3000a8ac8d21e8dce1d982eb",
+ "content-hash": "930b4b24df5a1782d5cd2a05de9ffda6",
"packages": [
{
"name": "alchemy/zippy",
@@ -1384,17 +1384,17 @@
},
{
"name": "drupal/admin_toolbar",
- "version": "1.24.0",
+ "version": "1.26.0",
"source": {
"type": "git",
"url": "https://git.drupal.org/project/admin_toolbar",
- "reference": "8.x-1.24"
+ "reference": "8.x-1.26"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/admin_toolbar-8.x-1.24.zip",
- "reference": "8.x-1.24",
- "shasum": "682ffa443a1e339583022eb6adbb00c1103ea6d4"
+ "url": "https://ftp.drupal.org/files/projects/admin_toolbar-8.x-1.26.zip",
+ "reference": "8.x-1.26",
+ "shasum": "7be9f91008bf17cf49b43d1c8e2211e7a8e40ce4"
},
"require": {
"drupal/core": "*"
@@ -1405,8 +1405,8 @@
"dev-1.x": "1.x-dev"
},
"drupal": {
- "version": "8.x-1.24",
- "datestamp": "1527523080",
+ "version": "8.x-1.26",
+ "datestamp": "1549218480",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -4711,8 +4711,7 @@
"homepage": "https://www.drupal.org/project/migrate_devel",
"support": {
"source": "http://cgit.drupalcode.org/migrate_devel"
- },
- "time": "2017-06-25T23:46:13+00:00"
+ }
},
{
"name": "drupal/migrate_plus",
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index b2529913438565f9940528ac48862ffd22422c15..fc78d53e27a7719cd4d76f8755da4c9b2f9551ea 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1429,18 +1429,18 @@
},
{
"name": "drupal/admin_toolbar",
- "version": "1.24.0",
- "version_normalized": "1.24.0.0",
+ "version": "1.26.0",
+ "version_normalized": "1.26.0.0",
"source": {
"type": "git",
"url": "https://git.drupal.org/project/admin_toolbar",
- "reference": "8.x-1.24"
+ "reference": "8.x-1.26"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/admin_toolbar-8.x-1.24.zip",
- "reference": "8.x-1.24",
- "shasum": "682ffa443a1e339583022eb6adbb00c1103ea6d4"
+ "url": "https://ftp.drupal.org/files/projects/admin_toolbar-8.x-1.26.zip",
+ "reference": "8.x-1.26",
+ "shasum": "7be9f91008bf17cf49b43d1c8e2211e7a8e40ce4"
},
"require": {
"drupal/core": "*"
@@ -1451,8 +1451,8 @@
"dev-1.x": "1.x-dev"
},
"drupal": {
- "version": "8.x-1.24",
- "datestamp": "1527523080",
+ "version": "8.x-1.26",
+ "datestamp": "1549218480",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
diff --git a/web/modules/admin_toolbar/CHANGELOG.txt b/web/modules/admin_toolbar/CHANGELOG.txt
index a3a0d75b40a9e2b044bc322c26d5339b9eb5c79b..5fea31ee3e29613b08b66f0ca6eb664ec76f3e48 100644
--- a/web/modules/admin_toolbar/CHANGELOG.txt
+++ b/web/modules/admin_toolbar/CHANGELOG.txt
@@ -1,3 +1,21 @@
+Admin Toolbar 8.x-1.25, 2018-11-22
+----------------------------------
+Changes since 8.x-1.24:
+
+- #3012102 by tikaszvince, Jody Lynn, adriancid, grahl, jigarius: Provider
+ property missing on link definition.
+- #3010451 by epowelljr, adriancid: Improve the admin_toolbar module
+ description.
+- #2958415 by adriancid, romainj, Prashant.c, harshita29: Replace usages of the
+ deprecated drupal_set_message() function.
+- #2996485 by idebr, adriancid: Remove unused function
+ admin_toolbar_tools_get_links().
+- #2989281 by JKerschner, adriancid: Consistently use $entityTypeManager.
+- #2985106 by Eli-T, adriancid, eme: Add ability to hide Drupal.org links
+ exposed by admin_toolbar_tools from certain users.
+- #2938884 by Spurlos, bdanin, romainj, purdy_nc, adriancid: A non-existent
+ route breaks the site.
+
Admin Toolbar 8.x-1.24, 2018-05-28
----------------------------------
Changes since 8.x-1.23:
diff --git a/web/modules/admin_toolbar/admin_toolbar.info.yml b/web/modules/admin_toolbar/admin_toolbar.info.yml
index a8b87bf027480eeb8b7c3b0f819c345dd1fc3586..2e6857e41fb73f7376ffc2cec8e287d2787a6179 100644
--- a/web/modules/admin_toolbar/admin_toolbar.info.yml
+++ b/web/modules/admin_toolbar/admin_toolbar.info.yml
@@ -1,5 +1,5 @@
name: Admin Toolbar
-description: Provides a drop-down menu interface to the site Toolbar.
+description: Provides an improved drop-down menu interface to the site Toolbar.
package: Administration
type: module
@@ -8,8 +8,8 @@ type: module
dependencies:
- drupal:toolbar
-# Information added by Drupal.org packaging script on 2018-05-28
-version: '8.x-1.24'
+# Information added by Drupal.org packaging script on 2019-02-03
+version: '8.x-1.26'
core: '8.x'
project: 'admin_toolbar'
-datestamp: 1527522484
+datestamp: 1549218484
diff --git a/web/modules/admin_toolbar/admin_toolbar.install b/web/modules/admin_toolbar/admin_toolbar.install
new file mode 100644
index 0000000000000000000000000000000000000000..bd80e9a06852a012aa375fd61918a93ac15fb8c2
--- /dev/null
+++ b/web/modules/admin_toolbar/admin_toolbar.install
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * @file
+ * Install, update and uninstall functions for the Admin Toolbar module.
+ */
+
+/**
+ * Rebuild routes to mitigate issue 2938884.
+ *
+ * @see https://www.drupal.org/project/admin_toolbar/issues/2938884
+ */
+function admin_toolbar_update_8001() {
+ // Rebuilding the route cache.
+ \Drupal::service("router.builder")->rebuild();
+}
diff --git a/web/modules/admin_toolbar/admin_toolbar_links_access_filter/admin_toolbar_links_access_filter.info.yml b/web/modules/admin_toolbar/admin_toolbar_links_access_filter/admin_toolbar_links_access_filter.info.yml
index 46edfd8a4d7585a9391aa9c19a115b087fb1d9b5..7e743e26c47eda24a53a7323db141026bd63bd66 100644
--- a/web/modules/admin_toolbar/admin_toolbar_links_access_filter/admin_toolbar_links_access_filter.info.yml
+++ b/web/modules/admin_toolbar/admin_toolbar_links_access_filter/admin_toolbar_links_access_filter.info.yml
@@ -8,8 +8,8 @@ type: module
dependencies:
- admin_toolbar:admin_toolbar
-# Information added by Drupal.org packaging script on 2018-05-28
-version: '8.x-1.24'
+# Information added by Drupal.org packaging script on 2019-02-03
+version: '8.x-1.26'
core: '8.x'
project: 'admin_toolbar'
-datestamp: 1527522484
+datestamp: 1549218484
diff --git a/web/modules/admin_toolbar/admin_toolbar_tools/admin_toolbar_tools.info.yml b/web/modules/admin_toolbar/admin_toolbar_tools/admin_toolbar_tools.info.yml
index a42c0ccbeb7e8d5a19d8f07e65aaefd383850ab4..d94726473e6cf7217782527b43f34c66e6913f83 100644
--- a/web/modules/admin_toolbar/admin_toolbar_tools/admin_toolbar_tools.info.yml
+++ b/web/modules/admin_toolbar/admin_toolbar_tools/admin_toolbar_tools.info.yml
@@ -7,10 +7,10 @@ type: module
dependencies:
- admin_toolbar:admin_toolbar
- - drupal:system (>=8.3)
+ - drupal:system (>=8.5)
-# Information added by Drupal.org packaging script on 2018-05-28
-version: '8.x-1.24'
+# Information added by Drupal.org packaging script on 2019-02-03
+version: '8.x-1.26'
core: '8.x'
project: 'admin_toolbar'
-datestamp: 1527522484
+datestamp: 1549218484
diff --git a/web/modules/admin_toolbar/admin_toolbar_tools/admin_toolbar_tools.links.menu.yml b/web/modules/admin_toolbar/admin_toolbar_tools/admin_toolbar_tools.links.menu.yml
index fc7df7f1ca99bf368f27a2cc762f12ad89efe5ac..e39dbe94091c060b59ac6ce7b051b88e669104a5 100644
--- a/web/modules/admin_toolbar/admin_toolbar_tools/admin_toolbar_tools.links.menu.yml
+++ b/web/modules/admin_toolbar/admin_toolbar_tools/admin_toolbar_tools.links.menu.yml
@@ -74,24 +74,3 @@ admin_toolbar_tools.flush_rendercache:
route_name: admin_toolbar_tools.flush_rendercache
parent: admin_toolbar_tools.flush
menu_name: admin
-
-admin_toolbar_tools.drupalorg:
- title: 'Drupal.org'
- weight: -5
- url: https://www.drupal.org
- parent: admin_toolbar_tools.help
- menu_name: admin
-
-admin_toolbar_tools.listchanges:
- title: 'Change records for Drupal core'
- weight: -6
- url: https://www.drupal.org/list-changes
- parent: admin_toolbar_tools.drupalorg
- menu_name: admin
-
-admin_toolbar_tools.doc:
- title: 'D8 API documentation'
- weight: -5
- url: https://api.drupal.org/api/drupal/8
- parent: admin_toolbar_tools.drupalorg
- menu_name: admin
diff --git a/web/modules/admin_toolbar/admin_toolbar_tools/admin_toolbar_tools.module b/web/modules/admin_toolbar/admin_toolbar_tools/admin_toolbar_tools.module
index 1db436a1d1ff49faecf4323b9374c7b2ecbce2bc..cd56261ec37c37bd450a9a67ce93600923967c75 100644
--- a/web/modules/admin_toolbar/admin_toolbar_tools/admin_toolbar_tools.module
+++ b/web/modules/admin_toolbar/admin_toolbar_tools/admin_toolbar_tools.module
@@ -48,13 +48,26 @@ function admin_toolbar_tools_help($route_name, RouteMatchInterface $route_match)
* Implements hook_menu_links_discovered_alter().
*/
function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
+ $languageManager = \Drupal::languageManager();
+ $config_override_language = $languageManager->getConfigOverrideLanguage();
+ $languageManager->setConfigOverrideLanguage($languageManager->getLanguage('en'));
+
$moduleHandler = \Drupal::moduleHandler();
$entityTypeManager = \Drupal::entityTypeManager();
$routeProvider = \Drupal::service('router.route_provider');
- $routes = [];
- foreach ($routeProvider->getAllRoutes() as $route_name => $route) {
- $routes[] = $route_name;
- }
+
+ /**
+ * Determine if a route exists by name.
+ *
+ * @param $routeName
+ * The name of the route to check.
+ *
+ * @return bool
+ * Whether a route with that route name exists.
+ */
+ $routeExists = function ($routeName) use ($routeProvider) {
+ return (count($routeProvider->getRoutesByNames([$routeName])) === 1);
+ };
$entityTypes = $entityTypeManager->getDefinitions();
$content_entities = [];
@@ -71,14 +84,16 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
if ($moduleHandler->moduleExists('views')) {
$links['admin_toolbar_tools.flush_views'] = [
'title' => t('Flush views cache'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'admin_toolbar_tools.flush_views',
'menu_name' => 'admin',
'parent' => 'admin_toolbar_tools.flush',
];
// Adding a menu link to Files.
- if ($moduleHandler->moduleExists('file') && in_array('view.files.page_1', $routes)) {
+ if ($moduleHandler->moduleExists('file') && $routeExists('view.files.page_1')) {
$links['admin_toolbar_tools.view.files'] = [
'title' => t('Files'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'view.files.page_1',
'menu_name' => 'admin',
'parent' => 'system.admin_content',
@@ -93,21 +108,23 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
foreach ($entityTypeManager->getStorage($content_entity_bundle)->loadMultiple() as $machine_name => $bundle) {
// Normally, the edit form for the bundle would be its root link.
$content_entity_bundle_root = NULL;
- if (in_array('entity.' . $content_entity_bundle . '.overview_form', $routes)) {
+ if ($routeExists('entity.' . $content_entity_bundle . '.overview_form')) {
// Some bundles have an overview/list form that make a better root link.
$content_entity_bundle_root = 'entity.' . $content_entity_bundle . '.overview_form.' . $machine_name;
$links[$content_entity_bundle_root] = [
'title' => t($bundle->label()),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'entity.' . $content_entity_bundle . '.overview_form',
'menu_name' => 'admin',
'parent' => 'entity.' . $content_entity_bundle . '.collection',
'route_parameters' => [$content_entity_bundle => $machine_name],
];
}
- if (in_array('entity.' . $content_entity_bundle . '.edit_form', $routes)) {
+ if ($routeExists('entity.' . $content_entity_bundle . '.edit_form')) {
$key = 'entity.' . $content_entity_bundle . '.edit_form.' . $machine_name;
$links[$key] = [
'title' => t($bundle->label()),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'entity.' . $content_entity_bundle . '.edit_form',
'menu_name' => 'admin',
'parent' => 'entity.' . $content_entity_bundle . '.collection',
@@ -122,9 +139,10 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
}
}
if ($moduleHandler->moduleExists('field_ui')) {
- if (in_array('entity.' . $content_entity . '.field_ui_fields', $routes)) {
+ if ($routeExists('entity.' . $content_entity . '.field_ui_fields')) {
$links['entity.' . $content_entity . '.field_ui_fields' . $machine_name] = [
'title' => t('Manage fields'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'entity.' . $content_entity . '.field_ui_fields',
'menu_name' => 'admin',
'parent' => $content_entity_bundle_root,
@@ -132,9 +150,10 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
'weight' => 1,
];
}
- if (in_array('entity.entity_form_display.' . $content_entity . '.default', $routes)) {
+ if ($routeExists('entity.entity_form_display.' . $content_entity . '.default')) {
$links['entity.entity_form_display.' . $content_entity . '.default' . $machine_name] = [
'title' => t('Manage form display'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'entity.entity_form_display.' . $content_entity . '.default',
'menu_name' => 'admin',
'parent' => $content_entity_bundle_root,
@@ -142,9 +161,10 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
'weight' => 2,
];
}
- if (in_array('entity.entity_view_display.' . $content_entity . '.default', $routes)) {
+ if ($routeExists('entity.entity_view_display.' . $content_entity . '.default')) {
$links['entity.entity_view_display.' . $content_entity . '.default.' . $machine_name] = [
'title' => t('Manage display'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'entity.entity_view_display.' . $content_entity . '.default',
'menu_name' => 'admin',
'parent' => $content_entity_bundle_root,
@@ -153,9 +173,10 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
];
}
}
- if ($moduleHandler->moduleExists('devel') && in_array('entity.' . $content_entity_bundle . '.devel_load', $routes)) {
+ if ($moduleHandler->moduleExists('devel') && $routeExists('entity.' . $content_entity_bundle . '.devel_load')) {
$links['entity.' . $content_entity_bundle . '.devel_load.' . $machine_name] = [
'title' => t('Devel'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'entity.' . $content_entity_bundle . '.devel_load',
'menu_name' => 'admin',
'parent' => $content_entity_bundle_root,
@@ -163,9 +184,10 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
'weight' => 4,
];
}
- if (in_array('entity.' . $content_entity_bundle . '.delete_form', $routes)) {
+ if ($routeExists('entity.' . $content_entity_bundle . '.delete_form')) {
$links['entity.' . $content_entity_bundle . '.delete_form.' . $machine_name] = [
'title' => t('Delete'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'entity.' . $content_entity_bundle . '.delete_form',
'menu_name' => 'admin',
'parent' => $content_entity_bundle_root,
@@ -179,30 +201,35 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
// Add user links.
$links['user.admin_create'] = [
'title' => t('Add a new user'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'user.admin_create',
'menu_name' => 'admin',
'parent' => 'entity.user.collection',
];
$links['user.admin_permissions'] = [
'title' => t('Permissions'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'user.admin_permissions',
'menu_name' => 'admin',
'parent' => 'entity.user.collection',
];
$links['entity.user_role.collection'] = [
'title' => t('Roles'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'entity.user_role.collection',
'menu_name' => 'admin',
'parent' => 'entity.user.collection',
];
$links['admin_toolbar_tools.user.logout'] = [
'title' => t('Logout'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'user.logout',
'parent' => 'admin_toolbar_tools.help',
'weight' => 10,
];
$links['user.role_add'] = [
'title' => t('Add a new role'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'user.role_add',
'menu_name' => 'admin',
'parent' => 'entity.user_role.collection',
@@ -211,18 +238,21 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
if ($moduleHandler->moduleExists('field_ui')) {
$links['entity.user.field_ui_fields_'] = [
'title' => t('Manage fields'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'entity.user.field_ui_fields',
'menu_name' => 'admin',
'parent' => 'entity.user.admin_form',
];
$links['entity.entity_form_display.user.default_'] = [
'title' => t('Manage form display'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'entity.entity_form_display.user.default',
'menu_name' => 'admin',
'parent' => 'entity.user.admin_form',
];
$links['entity.entity_view_display.user.default_'] = [
'title' => t('Manage display'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'entity.entity_view_display.user.default',
'menu_name' => 'admin',
'parent' => 'entity.user.admin_form',
@@ -231,6 +261,7 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
foreach (user_roles() as $role) {
$links['entity.user_role.edit_form.' . $role->id()] = [
'title' => t($role->label()),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'entity.user_role.edit_form',
'menu_name' => 'admin',
'parent' => 'entity.user_role.collection',
@@ -238,6 +269,7 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
];
$links['entity.user_role.edit_permissions_form.' . $role->id()] = [
'title' => t('Edit permissions'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'entity.user_role.edit_permissions_form',
'menu_name' => 'admin',
'parent' => 'entity.user_role.edit_form.' . $role->id(),
@@ -245,6 +277,7 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
];
$links['entity.user_role.delete_form.' . $role->id()] = [
'title' => t('Delete'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'entity.user_role.delete_form',
'menu_name' => 'admin',
'parent' => 'entity.user_role.edit_form.' . $role->id(),
@@ -253,6 +286,7 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
if ($moduleHandler->moduleExists('devel')) {
$links['entity.user_role.devel_load.' . $role->id()] = [
'title' => t('Devel'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'entity.user_role.devel_load',
'menu_name' => 'admin',
'parent' => 'entity.user_role.edit_form.' . $role->id(),
@@ -266,6 +300,7 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
$links['admin_toolbar_tools.add_content']['parent'] = 'system.admin_content';
$links['node.type_add'] = [
'title' => t('Add content type'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'node.type_add',
'menu_name' => 'admin',
'parent' => 'entity.node_type.collection',
@@ -275,6 +310,7 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
foreach ($entityTypeManager->getStorage('node_type')->loadMultiple() as $type) {
$links['node.add.' . $type->id()] = [
'title' => t($type->label()),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'node.add',
'parent' => 'admin_toolbar_tools.add_content',
'route_parameters' => ['node_type' => $type->id()],
@@ -285,12 +321,14 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
if ($moduleHandler->moduleExists('field_ui')) {
$links['field_ui.entity_form_mode_add'] = [
'title' => t('Add new form mode'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'field_ui.entity_form_mode_add',
'menu_name' => 'admin',
'parent' => 'entity.entity_form_mode.collection',
];
$links['field_ui.entity_view_mode_add'] = [
'title' => t('Add new view mode'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'field_ui.entity_view_mode_add',
'menu_name' => 'admin',
'parent' => 'entity.entity_view_mode.collection',
@@ -300,6 +338,7 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
if ($moduleHandler->moduleExists('taxonomy')) {
$links['entity.taxonomy_vocabulary.add_form'] = [
'title' => t('Add vocabulary'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'entity.taxonomy_vocabulary.add_form',
'menu_name' => 'admin',
'parent' => 'entity.taxonomy_vocabulary.collection',
@@ -310,6 +349,7 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
if ($moduleHandler->moduleExists('menu_ui')) {
$links['entity.menu.add_form'] = [
'title' => t('Add menu'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'entity.menu.add_form',
'menu_name' => 'admin',
'parent' => 'entity.menu.collection',
@@ -319,6 +359,7 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
foreach (menu_ui_get_menus() as $machine_name => $label) {
$links['entity.menu.edit_form.' . $machine_name] = [
'title' => t($label),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'entity.menu.edit_form',
'menu_name' => 'admin',
'parent' => 'entity.menu.collection',
@@ -326,14 +367,16 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
];
$links['entity.menu.delete_form.' . $machine_name] = [
'title' => t('Delete'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'entity.menu.delete_form',
'menu_name' => 'admin',
'parent' => 'entity.menu.edit_form.' . $machine_name,
'route_parameters' => ['menu' => $machine_name],
];
- if ($moduleHandler->moduleExists('devel')) {
+ if ($moduleHandler->moduleExists('devel') && $routeExists('entity.menu.devel_load')) {
$links['entity.menu.devel_load.' . $machine_name] = [
'title' => t('Devel'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'entity.menu.devel_load',
'menu_name' => 'admin',
'parent' => 'entity.menu.edit_form.' . $machine_name,
@@ -342,6 +385,7 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
}
$links['entity.menu.add_link_form.' . $machine_name] = [
'title' => t('Add link'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'entity.menu.add_link_form',
'menu_name' => 'admin',
'parent' => 'entity.menu.edit_form.' . $machine_name,
@@ -354,6 +398,7 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
if ($moduleHandler->moduleExists('block_content')) {
$links['block_content.add_page'] = [
'title' => t('Add custom block'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'block_content.add_page',
'menu_name' => 'admin',
'parent' => 'block.admin_display',
@@ -361,12 +406,14 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
];
$links['entity.block_content.collection'] = [
'title' => t('Custom block library'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'entity.block_content.collection',
'menu_name' => 'admin',
'parent' => 'block.admin_display',
];
$links['entity.block_content_type.collection'] = [
'title' => t('Types'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'entity.block_content_type.collection',
'menu_name' => 'admin',
'parent' => 'block.admin_display',
@@ -377,6 +424,7 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
if ($moduleHandler->moduleExists('contact')) {
$links['contact.form_add'] = [
'title' => t('Add contact form'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'contact.form_add',
'menu_name' => 'admin',
'parent' => 'entity.contact_form.collection',
@@ -388,12 +436,14 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
if ($moduleHandler->moduleExists('update')) {
$links['update.module_update'] = [
'title' => t('Update'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'update.module_update',
'menu_name' => 'admin',
'parent' => 'system.modules_list',
];
$links['update.module_install'] = [
'title' => t('Install new module'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'update.module_install',
'menu_name' => 'admin',
'parent' => 'system.modules_list',
@@ -404,6 +454,7 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
if ($moduleHandler->moduleExists('devel')) {
$links['admin_development'] = [
'title' => t('Development'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'system.admin_config_development',
'menu_name' => 'admin',
'parent' => 'admin_toolbar_tools.help',
@@ -411,6 +462,7 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
];
$links['admin_toolbar_tools.devel.admin_settings'] = [
'title' => t('Devel settings'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'devel.admin_settings',
'menu_name' => 'admin',
'parent' => 'admin_development',
@@ -419,6 +471,7 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
if ($moduleHandler->moduleExists('webprofiler')) {
$links['admin_toolbar_tools.devel.webprofiler'] = [
'title' => t('Web Profiler settings'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'webprofiler.settings',
'menu_name' => 'admin',
'parent' => 'admin_development',
@@ -426,53 +479,55 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
}
$links['admin_toolbar_tools.devel.configs_list'] = [
'title' => t('Config editor'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'devel.configs_list',
'menu_name' => 'admin',
'parent' => 'admin_development',
];
$links['admin_toolbar_tools.devel.reinstall'] = [
'title' => t('Reinstall modules'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'devel.reinstall',
'parent' => 'admin_development',
];
$links['admin_toolbar_tools.devel.menu_rebuild'] = [
'title' => t('Rebuild menu'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'devel.menu_rebuild',
'menu_name' => 'admin',
'parent' => 'admin_development',
];
$links['admin_toolbar_tools.devel.state_system_page'] = [
'title' => t('State editor'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'devel.state_system_page',
'menu_name' => 'admin',
'parent' => 'admin_development',
];
$links['admin_toolbar_tools.devel.theme_registry'] = [
'title' => t('Theme registry'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'devel.theme_registry',
'menu_name' => 'admin',
'parent' => 'admin_development',
];
$links['admin_toolbar_tools.devel.entity_info_page'] = [
'title' => t('Entity Info'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'devel.entity_info_page',
'menu_name' => 'admin',
'parent' => 'admin_development',
];
- $links['admin_toolbar_tools.devel.execute_php'] = [
- 'title' => t('Execute PHP Code'),
- 'route_name' => 'devel.execute_php',
- 'menu_name' => 'admin',
- 'parent' => 'admin_development',
- ];
$links['admin_toolbar_tools.devel.session'] = [
'title' => t('Session viewer'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'devel.session',
'menu_name' => 'admin',
'parent' => 'admin_development',
];
$links['admin_toolbar_tools.devel.elements_page'] = [
'title' => t('Form API field types'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'devel.elements_page',
'menu_name' => 'admin',
'parent' => 'admin_development',
@@ -480,16 +535,35 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
// Menu link for the Toolbar module.
$links['admin_toolbar_tools.toolbar.settings'] = [
'title' => t('Toolbar settings'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'devel.toolbar.settings_form',
'menu_name' => 'admin',
'parent' => 'devel.admin_settings',
];
}
-
+ // If module Devel PHP is enabled.
+ if ($moduleHandler->moduleExists('devel_php') && $routeExists('devel_php.execute_php')) {
+ $links['admin_toolbar_tools.devel_php.execute_php'] = [
+ 'title' => t('Execute PHP Code'),
+ 'route_name' => 'devel_php.execute_php',
+ 'menu_name' => 'admin',
+ 'parent' => 'admin_development',
+ ];
+ }
+ elseif ($moduleHandler->moduleExists('devel') && $routeExists('devel.execute_php')) {
+ $links['admin_toolbar_tools.devel.execute_php'] = [
+ 'title' => t('Execute PHP Code'),
+ 'provider' => 'admin_toolbar_tools',
+ 'route_name' => 'devel.execute_php',
+ 'menu_name' => 'admin',
+ 'parent' => 'admin_development',
+ ];
+ }
// If module Views Ui enabled.
if ($moduleHandler->moduleExists('views_ui')) {
$links['admin_toolbar_tools.views_ui.add'] = [
'title' => t('Add new view'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'views_ui.add',
'menu_name' => 'admin',
'parent' => 'entity.view.collection',
@@ -497,6 +571,7 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
];
$links['admin_toolbar_tools.views_ui.field_list'] = [
'title' => t('Used in views'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'views_ui.reports_fields',
'menu_name' => 'admin',
'parent' => 'entity.field_storage_config.collection',
@@ -505,6 +580,7 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
$links['admin_toolbar_tools.system.theme_settings'] = [
'title' => t('Settings'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'system.theme_settings',
'menu_name' => 'admin',
'parent' => 'system.themes_page',
@@ -513,6 +589,7 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
if ($moduleHandler->moduleExists('webprofiler')) {
$links['admin_toolbar_tools.devel.webprofiler'] = [
'title' => t('Webprofiler settings'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'webprofiler.settings',
'menu_name' => 'admin',
'parent' => 'admin_development',
@@ -522,12 +599,14 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
if ($moduleHandler->moduleExists('update')) {
$links['update.theme_install_'] = [
'title' => t('Install new theme'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'update.theme_install',
'menu_name' => 'admin',
'parent' => 'system.themes_page',
];
$links['update.theme_update_'] = [
'title' => t('Update'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'update.theme_update',
'menu_name' => 'admin',
'parent' => 'system.themes_page',
@@ -537,6 +616,7 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
foreach ($installed_themes as $key_theme => $label_theme) {
$links['system.theme_settings_theme.' . $key_theme] = [
'title' => t($label_theme),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'system.theme_settings_theme',
'menu_name' => 'admin',
'parent' => 'system.theme_settings_',
@@ -551,6 +631,7 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
if ($moduleHandler->moduleExists('language')) {
$links['admin_toolbar_tools.language.negotiation'] = [
'title' => t('Detection and selection'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'language.negotiation',
'menu_name' => 'admin',
'parent' => 'entity.configurable_language.collection',
@@ -561,14 +642,16 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
if ($moduleHandler->moduleExists('media')) {
$links['admin_toolbar_tools.add_media'] = [
'title' => t('Add media'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'entity.media.add_page',
'menu_name' => 'admin',
'parent' => 'system.admin_content',
];
// Add node links for each media type.
- foreach (\Drupal::entityTypeManager()->getStorage('media_type')->loadMultiple() as $type) {
+ foreach ($entityTypeManager->getStorage('media_type')->loadMultiple() as $type) {
$links['media.add.' . $type->id()] = [
'title' => t($type->label()),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'entity.media.add_form',
'parent' => 'admin_toolbar_tools.add_media',
'route_parameters' => ['media_type' => $type->id()],
@@ -580,6 +663,7 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
if ($moduleHandler->moduleExists('config')) {
$links['admin_toolbar_tools.config.import'] = [
'title' => t('Import'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'config.import_full',
'menu_name' => 'admin',
'parent' => 'config.sync',
@@ -587,12 +671,15 @@ function admin_toolbar_tools_menu_links_discovered_alter(&$links) {
];
$links['admin_toolbar_tools.config.export'] = [
'title' => t('Export'),
+ 'provider' => 'admin_toolbar_tools',
'route_name' => 'config.export_full',
'menu_name' => 'admin',
'parent' => 'config.sync',
'weight' => 2,
];
}
+
+ $languageManager->setConfigOverrideLanguage($config_override_language);
}
/**
@@ -613,20 +700,3 @@ function admin_toolbar_tools_installed_themes() {
return $themes_installed;
}
-
-/**
- * Get all links related to entity.
- *
- * @param string $entity_type_id
- * The machine name for the entity type.
- *
- * @return array
- * The links for the entity type.
- */
-function admin_toolbar_tools_get_links($entity_type_id) {
- $entity = \Drupal::entityTypeManager()->getDefinition($entity_type_id);
- // Get all links related to entity.
- $links = $entity->getLinkTemplates();
-
- return $links;
-}
diff --git a/web/modules/admin_toolbar/admin_toolbar_tools/composer.json b/web/modules/admin_toolbar/admin_toolbar_tools/composer.json
index 49414fc2b74bffb7e2ba63e55d7919fd0ed6ade7..41366480f4c62216a075e67bd4bed25fea379900 100644
--- a/web/modules/admin_toolbar/admin_toolbar_tools/composer.json
+++ b/web/modules/admin_toolbar/admin_toolbar_tools/composer.json
@@ -34,6 +34,6 @@
},
"require": {
"drupal/admin_toolbar": "^1",
- "drupal/core": "~8.3"
+ "drupal/core": "~8.5"
}
}
diff --git a/web/modules/admin_toolbar/admin_toolbar_tools/src/Controller/ToolbarController.php b/web/modules/admin_toolbar/admin_toolbar_tools/src/Controller/ToolbarController.php
index 8b74436c8cc2625daab8ab06706021db28ba7d1d..a8758628a4c7d96b200e08b9f5e1adabcd53d7ed 100644
--- a/web/modules/admin_toolbar/admin_toolbar_tools/src/Controller/ToolbarController.php
+++ b/web/modules/admin_toolbar/admin_toolbar_tools/src/Controller/ToolbarController.php
@@ -162,8 +162,8 @@ public function reloadPage() {
* Flushes all caches.
*/
public function flushAll() {
+ $this->messenger()->addMessage($this->t('All caches cleared.'));
drupal_flush_all_caches();
- drupal_set_message($this->t('All caches cleared.'));
return new RedirectResponse($this->reloadPage());
}
@@ -173,7 +173,7 @@ public function flushAll() {
public function flushJsCss() {
$this->state()
->set('system.css_js_query_string', base_convert($this->time->getCurrentTime(), 10, 36));
- drupal_set_message($this->t('CSS and JavaScript cache cleared.'));
+ $this->messenger()->addMessage($this->t('CSS and JavaScript cache cleared.'));
return new RedirectResponse($this->reloadPage());
}
@@ -182,7 +182,7 @@ public function flushJsCss() {
*/
public function flushPlugins() {
$this->pluginCacheClearer->clearCachedDefinitions();
- drupal_set_message($this->t('Plugins cache cleared.'));
+ $this->messenger()->addMessage($this->t('Plugins cache cleared.'));
return new RedirectResponse($this->reloadPage());
}
@@ -191,7 +191,7 @@ public function flushPlugins() {
*/
public function flushStatic() {
drupal_static_reset();
- drupal_set_message($this->t('Static cache cleared.'));
+ $this->messenger()->addMessage($this->t('Static cache cleared.'));
return new RedirectResponse($this->reloadPage());
}
@@ -204,7 +204,7 @@ public function flushMenu() {
$this->contextualLinkManager->clearCachedDefinitions();
$this->localTaskLinkManager->clearCachedDefinitions();
$this->localActionLinkManager->clearCachedDefinitions();
- drupal_set_message($this->t('Routing and links cache cleared.'));
+ $this->messenger()->addMessage($this->t('Routing and links cache cleared.'));
return new RedirectResponse($this->reloadPage());
}
@@ -213,7 +213,7 @@ public function flushMenu() {
*/
public function flushViews() {
views_invalidate_cache();
- drupal_set_message($this->t('Views cache cleared.'));
+ $this->messenger()->addMessage($this->t('Views cache cleared.'));
return new RedirectResponse($this->reloadPage());
}
@@ -224,7 +224,7 @@ public function flushTwig() {
// @todo Update once Drupal 8.6 will be released.
// @see https://www.drupal.org/node/2908461
PhpStorageFactory::get('twig')->deleteAll();
- drupal_set_message($this->t('Twig cache cleared.'));
+ $this->messenger()->addMessage($this->t('Twig cache cleared.'));
return new RedirectResponse($this->reloadPage());
}
@@ -233,7 +233,7 @@ public function flushTwig() {
*/
public function runCron() {
$this->cron->run();
- drupal_set_message($this->t('Cron ran successfully.'));
+ $this->messenger()->addMessage($this->t('Cron ran successfully.'));
return new RedirectResponse($this->reloadPage());
}
@@ -242,7 +242,7 @@ public function runCron() {
*/
public function cacheRender() {
$this->cacheRender->invalidateAll();
- drupal_set_message($this->t('Render cache cleared.'));
+ $this->messenger()->addMessage($this->t('Render cache cleared.'));
return new RedirectResponse($this->reloadPage());
}