Security: Rename system/config/modules to config/modules

Module config permission and application config permission have to be separeted. Application config related permissions were added beneath config/application and module related config permissions will be config/modules for now. refs #8720
Icinga · Mar 12, 2015 · 195fe6f · 195fe6f
1 parent f6e9551
commit 195fe6f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
@@ -159,7 +159,7 @@ public function moduleAction()
      */
     public function moduleenableAction()
     {
-        $this->assertPermission('system/config/modules');
+        $this->assertPermission('config/modules');
         $module = $this->getParam('name');
         $manager = Icinga::app()->getModuleManager();
         try {
@@ -179,7 +179,7 @@ public function moduleenableAction()
      */
     public function moduledisableAction()
     {
-        $this->assertPermission('system/config/modules');
+        $this->assertPermission('config/modules');
         $module = $this->getParam('name');
         $manager = Icinga::app()->getModuleManager();
         try {

diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
@@ -25,9 +25,9 @@ class RoleForm extends ConfigForm
         'system/config/*'                   => 'system/config/*',
         'config/application/general'        => 'config/application/general',
         'config/application/authentication' => 'config/application/authentication',
-        'system/config/modules'             => 'system/config/modules',
         'config/application/resources'      => 'config/application/resources',
-        'config/application/roles'          => 'config/application/roles'
+        'config/application/roles'          => 'config/application/roles',
+        'config/modules'                    => 'config/modules'
     );
 
     /**