Skip to content

Commit c2d9c19

Browse files
committed
Fixed groups and page ID
1 parent 54f6762 commit c2d9c19

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

Classes/Base/View.php

+5-4
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,15 @@ protected static function addAccess(\Aimeos\Base\View\Iface $view) : \Aimeos\Bas
9393

9494
if ($appType && $appType->isBackend()) {
9595
if ($t3context->getPropertyFromAspect('backend.user', 'isAdmin', false) === false) {
96-
$ids = $t3context->getPropertyFromAspect('backend.user', 'groupIds', []);
96+
$ids = array_filter($t3context->getPropertyFromAspect('backend.user', 'groupIds', []), fn ($id) => $id > 0);
9797
$names = $t3context->getPropertyFromAspect('backend.user', 'groupNames', []);
9898
$helper = new \Aimeos\Base\View\Helper\Access\Standard($view, array_combine($ids, $names));
9999
} else {
100100
$helper = new \Aimeos\Base\View\Helper\Access\All($view);
101101
}
102102
} else {
103103
if ($t3context->getPropertyFromAspect('frontend.user', 'isLoggedIn', false)) {
104-
$ids = $t3context->getPropertyFromAspect('frontend.user', 'groupIds', []);
104+
$ids = array_filter($t3context->getPropertyFromAspect('frontend.user', 'groupIds', []), fn ($id) => $id > 0);
105105
$names = $t3context->getPropertyFromAspect('frontend.user', 'groupNames', []);
106106
$helper = new \Aimeos\Base\View\Helper\Access\Standard($view, array_combine($ids, $names));
107107
} else {
@@ -347,6 +347,7 @@ protected static function addUrl(\Aimeos\Base\View\Iface $view, \Aimeos\Base\Con
347347
}
348348

349349
$fixed = [];
350+
$pageId = 0;
350351

351352
if ($request && $request->getAttribute('applicationType') === 1) { // for frontend requests only
352353
$name = $config->get('typo3/param/name/site', 'site');
@@ -368,9 +369,9 @@ protected static function addUrl(\Aimeos\Base\View\Iface $view, \Aimeos\Base\Con
368369
if ($request !== null && $request->hasArgument($name) === true) {
369370
$fixed[$name] = $request->getArgument($name);
370371
}
371-
}
372372

373-
$pageId = $request ? $request->getAttribute('routing')->getPageId() : 0;
373+
$pageId = $request->getAttribute('routing')->getPageId();
374+
}
374375

375376
if ($uriBuilder instanceof \TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder) {
376377
$url = new \Aimeos\Base\View\Helper\Url\Typo3($view, $uriBuilder->setTargetPageUid( $pageId ), $fixed);

0 commit comments

Comments
 (0)