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

Merge pull request #8685 from nextcloud/backport/8664/add-missing-settings-page-title-again 

[stable13] Set the correct active navigation entry
This commit is contained in:
Morris Jobke 2018-03-06 13:57:25 +01:00 committed by GitHub
parent 47fa0988d9 e11dab4047
commit 1bdf4f55cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
settings/Controller/AdminSettingsController.php
View File

@ -38,9 +38,6 @@ use OCP\Template;
class AdminSettingsController extends Controller {
use CommonSettingsTrait;
/** @var INavigationManager */
private $navigationManager;
/**
* @param string $appName
* @param IRequest $request
@ -65,7 +62,6 @@ class AdminSettingsController extends Controller {
* @NoCSRFRequired
*/
public function index($section) {
$this->navigationManager->setActiveEntry('admin');
return $this->getIndexResponse('admin', $section);
}

5
settings/Controller/CommonSettingsTrait.php
View File

@ -25,6 +25,7 @@
namespace OC\Settings\Controller;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\INavigationManager;
use OCP\Settings\IManager as ISettingsManager;
use OCP\Settings\IIconSection;
use OCP\Settings\ISettings;
@ -33,6 +34,9 @@ trait CommonSettingsTrait {
/** @var ISettingsManager */
private $settingsManager;
/** @var INavigationManager */
private $navigationManager;
/**
* @param string $currentSection
* @return array
@ -116,6 +120,7 @@ trait CommonSettingsTrait {
}
private function getIndexResponse($type, $section) {
$this->navigationManager->setActiveEntry('settings');
$templateParams = [];
$templateParams = array_merge($templateParams, $this->getNavigationParameters($type, $section));
$templateParams = array_merge($templateParams, $this->getSettings($section));

4
settings/Controller/PersonalSettingsController.php
View File

@ -34,9 +34,6 @@ use OCP\Template;
class PersonalSettingsController extends Controller {
use CommonSettingsTrait;
/** @var INavigationManager */
private $navigationManager;
public function __construct(
$appName,
IRequest $request,
@ -57,7 +54,6 @@ class PersonalSettingsController extends Controller {
* @NoSubadminRequired
*/
public function index($section) {
$this->navigationManager->setActiveEntry('personal');
return $this->getIndexResponse('personal', $section);
}