TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve the UX when user can customize a theme but not manage all themes 

Fixes #3301. Sponsored by @gavinworks
This commit is contained in:
Luke Towers 2019-03-14 10:59:34 -06:00
parent d5e7419312
commit 164e9877f7
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/cms/controllers/ThemeOptions.php
View File

@ -67,7 +67,15 @@ class ThemeOptions extends Controller
public function update_onSave($dirName = null)
{
$model = $this->getThemeData($this->getDirName($dirName));
$this->asExtension('FormController')->update_onSave($model->id);
$result = $this->asExtension('FormController')->update_onSave($model->id);
// Redirect close requests to the settings index when user doesn't have access
// to go back to the theme selection page
if (!$this->user->hasAccess('cms.manage_themes') && input('close')) {
$result = Backend::redirect('system/settings');
}
return $result;
}
public function update_onResetDefault($dirName = null)

7
modules/cms/controllers/Themes.php
View File

@ -28,7 +28,10 @@ class Themes extends Controller
/**
* @var array Permissions required to view this page.
*/
public $requiredPermissions = ['cms.manage_themes'];
public $requiredPermissions = [
'cms.manage_themes',
'cms.manage_theme_options',
];
/**
* Constructor.
@ -47,7 +50,7 @@ class Themes extends Controller
* Custom redirect for unauthorized request
*/
$this->bindEvent('page.beforeDisplay', function() {
if (!$this->user->hasAnyAccess($this->requiredPermissions)) {
if (!$this->user->hasAccess('cms.manage_themes')) {
return Backend::redirect('cms/themeoptions/update');
}
});