sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #35309 from nextcloud/fix/fix-33856-Help_pages_Window_title_must_change_when_switching_sidebar_sections 

Help pages: set window title for sidebar sections
pull/35336/head
Christoph Wurst 2022-11-22 14:12:13 +07:00 committed by GitHub
parent 5bf96eecc6 3559334fec
commit cad2e4d341
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/settings/lib/Controller/HelpController.php
Unescape Escape View File

@ -33,6 +33,7 @@ use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\ContentSecurityPolicy;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\IGroupManager;
use OCP\IL10N;
use OCP\INavigationManager;
use OCP\IRequest;
use OCP\IURLGenerator;
@ -45,6 +46,8 @@ class HelpController extends Controller {
private $urlGenerator;
/** @var IGroupManager */
private $groupManager;
/** @var IL10N */
private $l10n;
/** @var string */
private $userId;
@ -55,13 +58,15 @@ class HelpController extends Controller {
INavigationManager $navigationManager,
IURLGenerator $urlGenerator,
?string $userId,
IGroupManager $groupManager
IGroupManager $groupManager,
IL10N $l10n
) {
parent::__construct($appName, $request);
$this->navigationManager = $navigationManager;
$this->urlGenerator = $urlGenerator;
$this->userId = $userId;
$this->groupManager = $groupManager;
$this->l10n = $l10n;
}
/**
@ -73,8 +78,9 @@ class HelpController extends Controller {
*/
public function help(string $mode = 'user'): TemplateResponse {
$this->navigationManager->setActiveEntry('help');
$pageTitle = $this->l10n->t('Administrator documentation');
if ($mode !== 'admin') {
$pageTitle = $this->l10n->t('User documentation');
$mode = 'user';
}
@ -91,6 +97,7 @@ class HelpController extends Controller {
'urlUserDocs' => $urlUserDocs,
'urlAdminDocs' => $urlAdminDocs,
'mode' => $mode,
'pageTitle' => $pageTitle,
]);
$policy = new ContentSecurityPolicy();
$policy->addAllowedFrameDomain('\'self\'');