ConfigController: Rename applicationAction to generalAction

Icinga · Jun 1, 2015 · 66fd7df · 66fd7df
1 parent 49bb09d
commit 66fd7df
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
@@ -38,12 +38,12 @@ public function init()
         $auth = $this->Auth();
         $allowedActions = array();
         if ($auth->hasPermission('config/application/general')) {
-            $tabs->add('application', array(
+            $tabs->add('general', array(
                 'title' => $this->translate('Adjust the general configuration of Icinga Web 2'),
-                'label' => $this->translate('Application'),
-                'url'   => 'config/application'
+                'label' => $this->translate('General'),
+                'url'   => 'config/general'
             ));
-            $allowedActions[] = 'application';
+            $allowedActions[] = 'general';
         }
         if ($auth->hasPermission('config/application/authentication')) {
             $tabs->add('authentication', array(
@@ -96,19 +96,19 @@ public function indexAction()
     }
 
     /**
-     * Application configuration
+     * General configuration
      *
-     * @throws SecurityException    If the user lacks the permission for configuring the application
+     * @throws SecurityException    If the user lacks the permission for configuring the general configuration
      */
-    public function applicationAction()
+    public function generalAction()
     {
         $this->assertPermission('config/application/general');
         $form = new GeneralConfigForm();
         $form->setIniConfig(Config::app());
         $form->handleRequest();
 
         $this->view->form = $form;
-        $this->view->tabs->activate('application');
+        $this->view->tabs->activate('general');
     }
 
     /**

diff --git a/...on/views/scripts/config/application.phtml → ...cation/views/scripts/config/general.phtml b/...on/views/scripts/config/application.phtml → ...cation/views/scripts/config/general.phtml
diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
@@ -250,7 +250,7 @@ protected function addMainMenuItems()
                 'priority'      => 400
             ));
             $section->add(t('Application'), array(
-                'url'           => 'config/application',
+                'url'           => 'config',
                 'permission'    => 'config/application/*',
                 'priority'      => 450
             ));