mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #14666 from nextcloud/design/settings-header 

Don't show 'Personal' header in settings when Admin section is not there
This commit is contained in:
Morris Jobke 2019-03-18 14:48:36 +01:00 committed by GitHub
parent c41687530d 970d52fc29
commit 4824d278f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
settings/templates/settings/frame.php
View File

@ -30,8 +30,10 @@ script('files', 'jquery.fileupload');
<div id="app-navigation"> <div id="app-navigation">
<ul> <ul>
<?php if(!empty($_['forms']['admin'])) { ?>
<li class="app-navigation-caption"><?php p($l->t('Personal')); ?></li> <li class="app-navigation-caption"><?php p($l->t('Personal')); ?></li>
<?php <?php
}
foreach($_['forms']['personal'] as $form) { foreach($_['forms']['personal'] as $form) {
if (isset($form['anchor'])) { if (isset($form['anchor'])) {
$anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.PersonalSettings.index', ['section' => $form['anchor']]); $anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.PersonalSettings.index', ['section' => $form['anchor']]);

3
tests/acceptance/features/access-levels.feature
View File

@ -12,7 +12,8 @@ Feature: access-levels
Scenario: regular users cannot see admin-level items on the Settings page Scenario: regular users cannot see admin-level items on the Settings page
Given I am logged in Given I am logged in
When I visit the settings page When I visit the settings page
Then I see that the "Personal" settings panel is shown Then I see that the "Personal info" entry in the settings panel is shown
And I see that the "Personal" settings panel is not shown
And I see that the "Administration" settings panel is not shown And I see that the "Administration" settings panel is not shown
Scenario: admin users can see admin-level items on the Settings page Scenario: admin users can see admin-level items on the Settings page

18
tests/acceptance/features/bootstrap/SettingsMenuContext.php
View File

@ -93,6 +93,15 @@ class SettingsMenuContext implements Context, ActorAwareInterface {
describedAs($itemText . " item in Settings panel"); describedAs($itemText . " item in Settings panel");
} }
/**
* @param string $itemText
* @return Locator
*/
private static function settingsPanelEntryFor($itemText) {
return Locator::forThe()->xpath("//div[@id = 'app-navigation']//ul//li[normalize-space() = '$itemText']")->
describedAs($itemText . " entry in Settings panel");
}
/** /**
* @return array * @return array
*/ */
@ -188,6 +197,15 @@ class SettingsMenuContext implements Context, ActorAwareInterface {
); );
} }
/**
* @Then I see that the :itemText entry in the settings panel is shown
*/
public function iSeeThatTheItemEntryInTheSettingsPanelIsShown($itemText) {
PHPUnit_Framework_Assert::assertTrue(
$this->actor->find(self::settingsPanelEntryFor($itemText), 10)->isVisible()
);
}
/** /**
* @Then I see that the :itemText settings panel is not shown * @Then I see that the :itemText settings panel is not shown
*/ */