Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Issue #2135445 by dww, Sam152, jessebeach, Mile23, Kristen Pol, Wim Leers, larowlan: Toolbar displays Manage tab even if the user is not permitted to see it" 

This reverts commit 211c6641f8.
8.7.x
Lee Rowlands 2019-03-07 19:12:45 +10:00
parent 17de81c580
commit edd0191d89
No known key found for this signature in database
GPG Key ID: 2B829A3DF9204DC4
4 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/modules/settings_tray/tests/src/FunctionalJavascript/SettingsTrayBlockFormTest.php
View File

@ -30,7 +30,6 @@ class SettingsTrayBlockFormTest extends SettingsTrayTestBase {
$user = $this->createUser([ $user = $this->createUser([
'administer blocks', 'administer blocks',
'access administration pages',
'access contextual links', 'access contextual links',
'access toolbar', 'access toolbar',
'administer nodes', 'administer nodes',

17
core/modules/toolbar/tests/src/Functional/ToolbarAdminMenuTest.php
View File

@ -394,23 +394,6 @@ class ToolbarAdminMenuTest extends BrowserTestBase {
$this->assertRaw('title="External URL & escaped"'); $this->assertRaw('title="External URL & escaped"');
} }
/**
* Tests that there is no Manage tab in the Toolbar for authenticated users.
*
* The authorized user should not have a Manage tab simply with the 'access
* toolbar' permission. They need 'access administration pages' for that.
*/
public function testEmptyMenuTray() {
// Log out the admin user because we're testing restricted access.
$this->drupalLogout();
$this->drupalLogin($this->drupalCreateUser(['access toolbar']));
$this->assertResponse(200);
// @todo The toolbar div itself still has the id "toolbar-administration".
// @see https://www.drupal.org/project/drupal/issues/1044090
$this->assertSession()->elementExists('css', 'div[id=toolbar-administration]');
$this->assertSession()->elementNotExists('css', 'a[id=toolbar-item-administration]');
}
/** /**
* Get the hash value from the admin menu subtrees route path. * Get the hash value from the admin menu subtrees route path.
* *

1
core/modules/toolbar/tests/src/FunctionalJavascript/ToolbarIntegrationTest.php
View File

@ -22,7 +22,6 @@ class ToolbarIntegrationTest extends WebDriverTestBase {
public function testToolbarToggling() { public function testToolbarToggling() {
$admin_user = $this->drupalCreateUser([ $admin_user = $this->drupalCreateUser([
'access toolbar', 'access toolbar',
'access administration pages',
'administer site configuration', 'administer site configuration',
'access content overview', 'access content overview',
]); ]);

12
core/modules/toolbar/toolbar.module
View File

@ -159,18 +159,6 @@ function toolbar_toolbar() {
'#weight' => -20, '#weight' => -20,
]; ];
// If the current user cannot access administration pages, we can save a large
// amount of unnecessary work by ending here. It'd be better to actually know
// if the admin menu tree is empty for them, but trying to load that tree only
// happens in a #pre_render callback, and at that point, it's too late. The
// entire toolbar is rendered with the 'user.permissions' #cache context, so
// we can safely do this here and it'll still be cached correctly.
// @see toolbar_prerender_toolbar_administration_tray()
// @see toolbar_page_top()
if (!\Drupal::currentUser()->hasPermission('access administration pages')) {
return $items;
}
// To conserve bandwidth, we only include the top-level links in the HTML. // To conserve bandwidth, we only include the top-level links in the HTML.
// The subtrees are fetched through a JSONP script that is generated at the // The subtrees are fetched through a JSONP script that is generated at the
// toolbar_subtrees route. We provide the JavaScript requesting that JSONP // toolbar_subtrees route. We provide the JavaScript requesting that JSONP