tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ConfigController: Rename applicationAction to generalAction

This commit is contained in:
Johannes Meyer 2015-06-01 16:35:27 +02:00
parent 49bb09d9d3
commit 66fd7dfd93
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
application/controllers/ConfigController.php
View File

@ -38,12 +38,12 @@ class ConfigController extends Controller
$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,11 +96,11 @@ class ConfigController extends Controller
}
/**
* 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();
@ -108,7 +108,7 @@ class ConfigController extends Controller
$form->handleRequest();
$this->view->form = $form;
$this->view->tabs->activate('application');
$this->view->tabs->activate('general');
}
/**

0
application/views/scripts/config/application.phtml → application/views/scripts/config/general.phtml
View File

2
library/Icinga/Web/Menu.php
View File

@ -250,7 +250,7 @@ class Menu implements RecursiveIterator
'priority' => 400
));
$section->add(t('Application'), array(
'url' => 'config/application',
'url' => 'config',
'permission' => 'config/application/*',
'priority' => 450
));