diff --git a/typo3/sysext/backend/Classes/Controller/PageTsConfig/PageTsConfigActiveController.php b/typo3/sysext/backend/Classes/Controller/PageTsConfig/PageTsConfigActiveController.php
index cebbba5df3558b7a314e6eab599dbd843541ca9b..cc6001b67b2ce98de487ff608c65c4e273bc7543 100644
--- a/typo3/sysext/backend/Classes/Controller/PageTsConfig/PageTsConfigActiveController.php
+++ b/typo3/sysext/backend/Classes/Controller/PageTsConfig/PageTsConfigActiveController.php
@@ -75,17 +75,12 @@ final class PageTsConfigActiveController
$moduleData = $request->getAttribute('moduleData');
$pageUid = (int)($parsedBody['id'] ?? $queryParams['id'] ?? 0);
- if ($pageUid <= 0) {
- // Redirect to records overview if on page 0 or invalid uid.
- return new RedirectResponse($this->uriBuilder->buildUriFromRoute('pagetsconfig_records'));
- }
-
$pageRecord = BackendUtility::readPageAccess($pageUid, '1=1') ?: [];
if (empty($pageRecord)) {
- // Redirect to records overview if page could not be determined.
+ // Redirect to overview if page could not be determined.
// Edge case if page has been removed meanwhile.
BackendUtility::setUpdateSignal('updatePageTree');
- return new RedirectResponse($this->uriBuilder->buildUriFromRoute('pagetsconfig_records'));
+ return new RedirectResponse($this->uriBuilder->buildUriFromRoute('pagetsconfig_pages'));
}
// Force boolean toggles to bool and init further get/post vars
@@ -184,13 +179,13 @@ final class PageTsConfigActiveController
}
$view = $this->moduleTemplateFactory->create($request);
- $view->setTitle($languageService->sL($currentModule->getTitle()), $pageRecord['title']);
+ $view->setTitle($languageService->sL($currentModule->getTitle()), $pageRecord['title'] ?? $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'] ?? '');
$view->getDocHeaderComponent()->setMetaInformation($pageRecord);
$this->addShortcutButtonToDocHeader($view, $currentModuleIdentifier, $pageRecord, $pageUid);
$view->makeDocHeaderModuleMenu(['id' => $pageUid]);
$view->assignMultiple([
'pageUid' => $pageUid,
- 'pageTitle' => $pageRecord['title'],
+ 'pageTitle' => $pageRecord['title'] ?? $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'] ?? '',
'displayConstantSubstitutions' => $displayConstantSubstitutions,
'displayComments' => $displayComments,
'sortAlphabetically' => $sortAlphabetically,
diff --git a/typo3/sysext/backend/Classes/Controller/PageTsConfig/PageTsConfigIncludesController.php b/typo3/sysext/backend/Classes/Controller/PageTsConfig/PageTsConfigIncludesController.php
index 739e77a3c50bab90ade5bc4730e87c56df2fa09b..b542552f1cdef68259c14d29a32d814109b6d358 100644
--- a/typo3/sysext/backend/Classes/Controller/PageTsConfig/PageTsConfigIncludesController.php
+++ b/typo3/sysext/backend/Classes/Controller/PageTsConfig/PageTsConfigIncludesController.php
@@ -80,16 +80,12 @@ final class PageTsConfigIncludesController
$moduleData = $request->getAttribute('moduleData');
$pageUid = (int)($queryParams['id'] ?? 0);
- if ($pageUid === 0) {
- // Redirect to template record overview if on page 0.
- return new RedirectResponse($this->uriBuilder->buildUriFromRoute('pagetsconfig_records'));
- }
$pageRecord = BackendUtility::readPageAccess($pageUid, '1=1') ?: [];
if (empty($pageRecord)) {
// Redirect to records overview if page could not be determined.
// Edge case if page has been removed meanwhile.
BackendUtility::setUpdateSignal('updatePageTree');
- return new RedirectResponse($this->uriBuilder->buildUriFromRoute('pagetsconfig_records'));
+ return new RedirectResponse($this->uriBuilder->buildUriFromRoute('pagetsconfig_pages'));
}
// Prepare site constants if any
@@ -154,12 +150,13 @@ final class PageTsConfigIncludesController
$treeTraverser->traverse($pageTsConfigTree);
$view = $this->moduleTemplateFactory->create($request);
- $view->setTitle($languageService->sL($currentModule->getTitle()), $pageRecord['title']);
+ $view->setTitle($languageService->sL($currentModule->getTitle()), $pageRecord['title'] ?? $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'] ?? '');
$view->getDocHeaderComponent()->setMetaInformation($pageRecord);
$this->addShortcutButtonToDocHeader($view, $currentModuleIdentifier, $pageRecord, $pageUid);
$view->makeDocHeaderModuleMenu(['id' => $pageUid]);
$view->assignMultiple([
'pageUid' => $pageUid,
+ 'pageTitle' => $pageRecord['title'] ?? $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'] ?? '',
'siteSettingsTree' => $siteSettingsTree,
'pageTsConfigTree' => $pageTsConfigTree,
'pageTsConfigConditions' => $pageTsConfigConditions,
diff --git a/typo3/sysext/backend/Classes/Controller/PageTsConfig/PageTsConfigRecordsOverviewController.php b/typo3/sysext/backend/Classes/Controller/PageTsConfig/PageTsConfigRecordsOverviewController.php
index e8d817119805d9a9832ef947c4ab6c7e6959a62c..e713e091661f148f58962d0be2135f70223e7c7f 100644
--- a/typo3/sysext/backend/Classes/Controller/PageTsConfig/PageTsConfigRecordsOverviewController.php
+++ b/typo3/sysext/backend/Classes/Controller/PageTsConfig/PageTsConfigRecordsOverviewController.php
@@ -94,9 +94,7 @@ final class PageTsConfigRecordsOverviewController
$view->assign('overviewOfPagesUsingTSConfig', $pagesUsingTSConfig);
}
- if ($pageId !== 0) {
- $view->makeDocHeaderModuleMenu(['id' => $pageId]);
- }
+ $view->makeDocHeaderModuleMenu(['id' => $pageId]);
return $view->renderResponse('PageTsConfig/RecordsOverview');
}
diff --git a/typo3/sysext/backend/Configuration/Backend/Modules.php b/typo3/sysext/backend/Configuration/Backend/Modules.php
index acdd489e4d257b2780fbc44360372390c6f4e975..4dc16fb8079d1adc5c99bb925dff8f8ee02675f2 100644
--- a/typo3/sysext/backend/Configuration/Backend/Modules.php
+++ b/typo3/sysext/backend/Configuration/Backend/Modules.php
@@ -99,7 +99,7 @@ return [
],
'navigationComponent' => '@typo3/backend/page-tree/page-tree-element',
],
- 'pagetsconfig_records' => [
+ 'pagetsconfig_pages' => [
'parent' => 'pagetsconfig',
'access' => 'admin',
'path' => '/module/pagetsconfig/records',
diff --git a/typo3/sysext/backend/Resources/Private/Language/locallang_pagetsconfig.xlf b/typo3/sysext/backend/Resources/Private/Language/locallang_pagetsconfig.xlf
index 0b261a9df212917753c3ce7a31b19f38b25f7a03..4f57bb2b5b2e8516b4081979f66c2a0e5606b6ee 100644
--- a/typo3/sysext/backend/Resources/Private/Language/locallang_pagetsconfig.xlf
+++ b/typo3/sysext/backend/Resources/Private/Language/locallang_pagetsconfig.xlf
@@ -88,7 +88,7 @@
<source>Included Page TSconfig</source>
</trans-unit>
<trans-unit id="module.pagetsconfig_includes.headline" resname="module.pagetsconfig_includes.headline">
- <source>Included Page TSconfig</source>
+ <source>Included Page TSconfig of page "%s"</source>
</trans-unit>
<trans-unit id="module.pagetsconfig_includes.description" resname="module.pagetsconfig_includes.description">
<source>Overview of the included TypoScript and include order for the current page.</source>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/PageTsConfig/Includes.html b/typo3/sysext/backend/Resources/Private/Templates/PageTsConfig/Includes.html
index 24af32a8051e4b42368b97348dead465e15a1c6f..654f12b1ef3e718d4b627ed35d7676398fac4c87 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/PageTsConfig/Includes.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/PageTsConfig/Includes.html
@@ -22,7 +22,12 @@
<typo3-immediate-action action="TYPO3.Backend.Storage.ModuleStateStorage.update" args="{args -> f:format.json() -> f:format.htmlspecialchars()}"></typo3-immediate-action>
<h1>
- <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_pagetsconfig.xlf:module.pagetsconfig_includes.headline" />
+ <f:translate
+ key="LLL:EXT:backend/Resources/Private/Language/locallang_pagetsconfig.xlf:module.pagetsconfig_includes.headline"
+ arguments="{
+ 0: '{pageTitle}'
+ }"
+ />
</h1>
<div>
<p class="lead"><f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_pagetsconfig.xlf:module.pagetsconfig_includes.description" /></p>