diff --git a/admin.php b/admin.php index d63a76b2..5815b1dd 100644 --- a/admin.php +++ b/admin.php @@ -715,7 +715,7 @@ class AdminPlugin extends Plugin $type = $e['type'] ?? null; switch ($type) { case 'config': - $e['type'] = $this->admin->authorize(['admin.configuration.system','admin.configuration_system','admin.super']) ? 'config/system' : 'config/site'; + $e['type'] = $this->admin->authorize(['admin.configuration.system', 'admin.super']) ? 'config/system' : 'config/site'; break; case 'tools/scheduler': $e['type'] = 'config/scheduler'; @@ -772,7 +772,10 @@ class AdminPlugin extends Plugin $this->grav['twig']->plugins_hooked_nav['PLUGIN_ADMIN.CONFIGURATION'] = [ 'route' => 'config', 'icon' => 'fa-wrench', - 'authorize' => ['admin.configuration.system', 'admin.configuration_system', 'admin.super'], + 'authorize' => [ + 'admin.configuration.system', + 'admin.configuration.site', + 'admin.super'], 'priority' => 9 ]; diff --git a/classes/plugin/AdminBaseController.php b/classes/plugin/AdminBaseController.php index 25ba554a..38fc23ae 100644 --- a/classes/plugin/AdminBaseController.php +++ b/classes/plugin/AdminBaseController.php @@ -515,13 +515,10 @@ class AdminBaseController case 'config': case 'system': $permissions[] = 'admin.configuration.system'; - $permissions[] = 'admin.configuration_system'; break; case 'settings': case 'site': $permissions[] = 'admin.configuration.site'; - $permissions[] = 'admin.configuration_site'; - $permissions[] = 'admin.settings'; break; case 'plugins': $permissions[] = 'admin.plugins'; diff --git a/permissions.yaml b/permissions.yaml index 9e27f8f4..e0db534d 100644 --- a/permissions.yaml +++ b/permissions.yaml @@ -26,23 +26,6 @@ actions: label: PLUGIN_ADMIN.ACCESS_ADMIN_CONFIGURATION_MEDIA info: label: PLUGIN_ADMIN.ACCESS_ADMIN_CONFIGURATION_INFO - - configuration_system: - type: alias - alias: admin.configuration.system - configuration_site: - type: alias - alias: admin.configuration.site - configuration_media: - type: alias - alias: admin.configuration.media - configuration_info: - type: alias - alias: admin.configuration.info - settings: - type: alias - alias: admin.configuration.site - pages: label: PLUGIN_ADMIN.ACCESS_ADMIN_PAGES maintenance: @@ -59,10 +42,5 @@ actions: label: PLUGIN_ADMIN.ACCESS_ADMIN_USERS types: - alias: - type: alias - visible: false - use: default - default: type: access diff --git a/themes/grav/templates/config.html.twig b/themes/grav/templates/config.html.twig index bbd14b17..5c9af480 100644 --- a/themes/grav/templates/config.html.twig +++ b/themes/grav/templates/config.html.twig @@ -2,7 +2,7 @@ {% set config_slug = uri.basename %} {% if config_slug == 'config' %} - {% set config_slug = authorize(['admin.configuration.system', 'admin.configuration_system', 'admin.super']) ? 'system' : 'site' %} + {% set config_slug = authorize(['admin.configuration.system', 'admin.super']) ? 'system' : 'site' %} {% endif %} {% set isInfo = (config_slug == 'info') %} @@ -43,13 +43,13 @@