Skip to content

[BUGFIX] Fix backend access to pageTreeRepository since TYPO3 v11.5.26 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chriwo wants to merge 6 commits into
base: feature/typo3-v11
Choose a base branch
from
Open

[BUGFIX] Fix backend access to pageTreeRepository since TYPO3 v11.5.26 #3

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8476388
[BUGFIX] Fix access to pageTreeRepository since TYPO3 v11.5.26
chriwo Apr 24, 2023
c210a81
Revert "[BUGFIX] Fix access to pageTreeRepository since TYPO3 v11.5.26"
chriwo Apr 24, 2023
a496886
[BUGFIX] Fix access to pageTreeRepository since TYPO3 v11.5.26
chriwo Apr 24, 2023
588f729
Add other changes from Core commit
chriwo Apr 24, 2023
c0717e7
Fix misspelling property name
chriwo Jul 17, 2023
d0dcc5d
Revert TYPO3 version compatibility and add function get correct pageT…
chriwo Jul 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions Classes/Overrides/TYPO3/CMS/Backend/Controller/Page/TreeController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace FBIT\PageReferences\Overrides\TYPO3\CMS\Backend\Controller\Page;

use FBIT\PageReferences\Domain\Model\ReferencePage;
use TYPO3\CMS\Backend\Tree\Repository\PageTreeRepository;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Imaging\Icon;
use TYPO3\CMS\Core\Type\Bitmask\Permission;
Expand Down Expand Up @@ -104,9 +105,7 @@ protected function pagesToFlatArray(array $page, int $entryPoint, int $depth = 0
'siblingsCount' => $page['siblingsCount'] ?? 1,
'siblingsPosition' => $page['siblingsPosition'] ?? 1,
'allowDelete' => $backendUser->doesUserHaveAccess($page, Permission::PAGE_DELETE),
'allowEdit' => $backendUser->doesUserHaveAccess($page, Permission::PAGE_EDIT)
&& $backendUser->check('tables_modify', 'pages')
&& $backendUser->checkLanguageAccess(0),
'allowEdit' => $this->userHasAccessToModifyPagesAndToDefaultLanguage && $backendUser->doesUserHaveAccess($page, Permission::PAGE_EDIT),
];

if (!empty($page['_children']) || $this->getPageTreeRepository()->hasChildren($pageId)) {
Expand All @@ -128,13 +127,13 @@ protected function pagesToFlatArray(array $page, int $entryPoint, int $depth = 0
$item['overlayIcon'] = $icon->getOverlayIcon()->getIdentifier();
}
if ($expanded && is_array($page['_children']) && !empty($page['_children'])) {
$item['expanded'] = $expanded;
$item['expanded'] = true;
}
if ($backgroundColor) {
$item['backgroundColor'] = htmlspecialchars($backgroundColor);
}
if ($stopPageTree) {
$item['stopPageTree'] = $stopPageTree;
$item['stopPageTree'] = true;
}
$class = $this->resolvePageCssClassNames($page);
if (!empty($class)) {
Expand All @@ -161,4 +160,13 @@ protected function pagesToFlatArray(array $page, int $entryPoint, int $depth = 0
}
return $items;
}

protected function getPageTreeRepository(): PageTreeRepository
{
if (method_exists(\TYPO3\CMS\Backend\Controller\Page\TreeController::class, 'getPageTreeRepository')) {
return parent::getPageTreeRepository();
}

return $this->pageTreeRepository;
}
}