Skip to content

Redirect in backend when system check rights #1502

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
gviabcua wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Redirect in backend when system check rights #1502

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions modules/cms/controllers/Index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,32 +93,32 @@ public function __construct()

$this->theme = $theme;

if ($this->user->hasAccess('cms.manage_pages')) {
if ($this->user?->hasAccess('cms.manage_pages')) {
new TemplateList($this, 'pageList', function () use ($theme) {
return Page::listInTheme($theme, true);
});
}

if ($this->user->hasAccess('cms.manage_partials')) {
if ($this->user?->hasAccess('cms.manage_partials')) {
new TemplateList($this, 'partialList', function () use ($theme) {
return Partial::listInTheme($theme, true);
});
}

if ($this->user->hasAccess('cms.manage_layouts')) {
if ($this->user?->hasAccess('cms.manage_layouts')) {
new TemplateList($this, 'layoutList', function () use ($theme) {
return Layout::listInTheme($theme, true);
});
}

if ($this->user->hasAccess('cms.manage_content')) {
if ($this->user?->hasAccess('cms.manage_content')) {
new TemplateList($this, 'contentList', function () use ($theme) {
return Content::listInTheme($theme, true);
});
}

if (
$this->user->hasAccess([
$this->user?->hasAccess([
'cms.manage_pages',
'cms.manage_partials',
'cms.manage_layouts',
Expand All @@ -127,7 +127,7 @@ public function __construct()
new ComponentList($this, 'componentList');
}

if ($this->user->hasAccess('cms.manage_assets')) {
if ($this->user?->hasAccess('cms.manage_assets')) {
new AssetList($this, 'assetList');
}
}
Expand Down Expand Up @@ -600,7 +600,7 @@ protected function validateRequestType(string $type): void
{
$this->resolveTypeClassName($type);

if (!$this->user->hasAccess($this->getRelevantPermissionForType($type))) {
if (!$this->user?->hasAccess($this->getRelevantPermissionForType($type))) {
throw new AuthorizationException(Lang::get('cms::lang.template.type_not_permitted', [
'type' => str_plural($type),
'permission' => $this->getRelevantPermissionForType($type),
Expand Down
Loading