make Settings of Personal and Admin into own views #40544
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| <?php | ||
| /** | ||
| * @copyright Copyright (c) 2016 Arthur Schiwon <blizzz@arthur-schiwon.de> | ||
| * | ||
| * @author Arthur Schiwon <blizzz@arthur-schiwon.de> | ||
| * @author Private Maker <privatemaker@posteo.net> | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| use OCP\IURLGenerator; | ||
|
|
||
| style('settings', 'settings'); | ||
| script('settings', 'settings'); | ||
| \OCP\Util::addScript('settings', 'legacy-admin'); | ||
| script('core', 'setupchecks'); | ||
| script('files', 'jquery.fileupload'); | ||
| ?> | ||
|
|
||
| <div id="app-navigation" role="navigation"> | ||
| <ul tabindex="0"> | ||
| <li class="app-navigation-caption"><?php p($l->t('Administration')); ?></li> | ||
| <?php foreach ($_['forms']['admin'] as $form): | ||
| if (isset($form['anchor'])): | ||
| $urlGenerator = \OC::$server->get(IURLGenerator::class); | ||
| $anchor = $urlGenerator->linkToRoute('settings.AdminSettings.index', ['section' => $form['anchor']]); | ||
| $class = 'nav-icon-' . $form['anchor']; | ||
| $sectionName = $form['section-name']; ?> | ||
| <li <?php print_unescaped($form['active'] ? ' class="active"' : ''); ?> data-section-id="<?php print_unescaped($form['anchor']); ?>" data-section-type="admin"> | ||
| <a href="<?php p($anchor); ?>"<?php print_unescaped($form['active'] ? ' aria-current="page"' : ''); ?>> | ||
| <?php if (!empty($form['icon'])) { ?> | ||
| <img alt="" src="<?php print_unescaped($form['icon']); ?>"> | ||
| <span><?php p($form['section-name']); ?></span> | ||
| <?php } else { ?> | ||
| <span class="no-icon"><?php p($form['section-name']); ?></span> | ||
| <?php } ?> | ||
| </a> | ||
| </li> | ||
| <?php endif ?> | ||
| <?php endforeach ?> | ||
| </ul> | ||
| </div> | ||
| <div id="app-content" tabindex="0" data-active-section-id="<?php print_unescaped($_['activeSectionId']) ?>"> | ||
| <?php print_unescaped($_['content']); ?> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ | |
| * @copyright Copyright (c) 2016 Arthur Schiwon <blizzz@arthur-schiwon.de> | ||
| * | ||
| * @author Arthur Schiwon <blizzz@arthur-schiwon.de> | ||
| * @author Private Maker <privatemaker@posteo.net> | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
|
|
@@ -26,17 +27,13 @@ | |
| \OCP\Util::addScript('settings', 'legacy-admin'); | ||
| script('core', 'setupchecks'); | ||
| script('files', 'jquery.fileupload'); | ||
| ?> | ||
|
|
||
| <div id="app-navigation" role="navigation"> | ||
| <ul tabindex="0"> | ||
| <li class="app-navigation-caption"><?php p($l->t('Personal')); ?></li> | ||
privatemaker marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| <?php foreach ($_['forms']['personal'] as $form): | ||
|
There was a problem hiding this comment. I find it weird that the underlying logic to render the setting sections is still executed for admin and personal, even if you visit the personal section and vice versa. |
||
| if (isset($form['anchor'])): | ||
| $anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.PersonalSettings.index', ['section' => $form['anchor']]); | ||
| $class = 'nav-icon-' . $form['anchor']; | ||
| $sectionName = $form['section-name']; ?> | ||
|
|
@@ -50,36 +47,8 @@ | |
| <?php } ?> | ||
| </a> | ||
| </li> | ||
|
There was a problem hiding this comment. Admin right privilege / Administration privileges is broken. It's possible to make some admin sections visible to groups without granting the users full admin rights. That's called Administration privileges (in Nextcloud) / Admin right privilege (in our Documentation).
Main:
Bob see the administration section but only one item. This PR:
Bob does not see the administration section. It's still possible the admin the section if you know the right url, but there is no link somewhere. The menu item "Administration settings" is only added for users with admin permission, but not administration privileges. Adding a link below "Settings" is a bit tricky for Administration privileges because you need to figure out the internal url for the given section. |
||
| <?php endif ?> | ||
| <?php endforeach ?> | ||
| </ul> | ||
| </div> | ||
| <div id="app-content" tabindex="0" data-active-section-id="<?php print_unescaped($_['activeSectionId']) ?>"> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| <?php | ||
| /** | ||
| * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch> | ||
| * | ||
| * @author Arthur Schiwon <blizzz@arthur-schiwon.de> | ||
| * @author Christoph Wurst <christoph@winzerhof-wurst.at> | ||
| * @author Jan C. Borchardt <hey@jancborchardt.net> | ||
| * @author Lukas Reschke <lukas@statuscode.ch> | ||
| * @author Roeland Jago Douma <roeland@famdouma.nl> | ||
| * @author Private Maker <privatemaker@posteo.net> | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
| namespace OCA\Settings\Tests\Controller; | ||
|
|
||
| use OCA\Settings\Controller\PersonalSettingsController; | ||
| use OCA\Settings\Settings\Personal\ServerDevNotice; | ||
| use OCP\AppFramework\Http\TemplateResponse; | ||
| use OCP\Group\ISubAdmin; | ||
| use OCP\IGroupManager; | ||
| use OCP\INavigationManager; | ||
| use OCP\IRequest; | ||
| use OCP\IUser; | ||
| use OCP\IUserSession; | ||
| use OCP\Settings\IManager; | ||
| use PHPUnit\Framework\MockObject\MockObject; | ||
| use Test\TestCase; | ||
|
|
||
| /** | ||
| * Class PersonalSettingsControllerTest | ||
| * | ||
| * @group DB | ||
| * | ||
| * @package Tests\Settings\Controller | ||
| */ | ||
| class PersonalSettingsControllerTest extends TestCase { | ||
|
|
||
| /** @var PersonalSettingsController */ | ||
| private $personalSettingsController; | ||
| /** @var IRequest|MockObject */ | ||
| private $request; | ||
| /** @var INavigationManager|MockObject */ | ||
| private $navigationManager; | ||
| /** @var IManager|MockObject */ | ||
| private $settingsManager; | ||
| /** @var IUserSession|MockObject */ | ||
| private $userSession; | ||
| /** @var IGroupManager|MockObject */ | ||
|
|
||
| protected function setUp(): void { | ||
| parent::setUp(); | ||
|
|
||
| $this->request = $this->createMock(IRequest::class); | ||
| $this->navigationManager = $this->createMock(INavigationManager::class); | ||
| $this->settingsManager = $this->createMock(IManager::class); | ||
| $this->userSession = $this->createMock(IUserSession::class); | ||
|
|
||
| $this->personalSettingsController = new PersonalSettingsController( | ||
| 'settings', | ||
| $this->request, | ||
| $this->navigationManager, | ||
| $this->settingsManager, | ||
| $this->userSession, | ||
| ); | ||
|
|
||
| $user = \OC::$server->getUserManager()->createUser($this->adminUid, 'mylongrandompassword'); | ||
|
There was a problem hiding this comment. This looks weird ;) Adding |
||
| \OC_User::setUserId($user->getUID()); | ||
| // \OC::$server->getGroupManager()->createGroup('admin')->addUser($user); | ||
| } | ||
|
|
||
| protected function tearDown(): void { | ||
| // \OC::$server->getUserManager()->get($this->adminUid)->delete(); | ||
|
|
||
| parent::tearDown(); | ||
| } | ||
|
|
||
| public function testIndex() { | ||
| $user = $this->createMock(IUser::class); | ||
| $this->userSession | ||
| ->method('getUser') | ||
| ->willReturn($user); | ||
| $user->method('getUID')->willReturn('user123'); | ||
| $this->settingsManager | ||
| ->expects($this->once()) | ||
| ->method('getPersonalSections') | ||
| ->willReturn([]); | ||
|
|
||
| $idx = $this->personalSettingsController->index('test'); | ||
|
|
||
| $expected = new TemplateResponse('settings', 'settings/personal', [ | ||
| 'forms' => ['personal' => []], | ||
| 'content' => '' | ||
| ]); | ||
| $this->assertEquals($expected, $idx); | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks wrong, please revert.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
happens by
bash build/autoloader…It's okay