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

Change form name of GeneralConfigPage to "setup_general_config" 

Used to be "setup_application_config".

refs #7163
This commit is contained in:
Johannes Meyer 2014-10-06 13:52:32 +02:00
parent 4c6b64f092
commit ac255eeda0
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/forms/Setup/GeneralConfigPage.php
View File

@ -19,7 +19,7 @@ class GeneralConfigPage extends Form
*/
public function init()
{
$this->setName('setup_application_config');
$this->setName('setup_general_config');
}
/**

14
library/Icinga/Application/WebInstaller.php
View File

@ -132,13 +132,13 @@ class WebInstaller implements Installer
)
);
$loggingLevel = $this->pageData['setup_application_config']['logging_level'];
$loggingType = $this->pageData['setup_application_config']['logging_type'];
$loggingLevel = $this->pageData['setup_general_config']['logging_level'];
$loggingType = $this->pageData['setup_general_config']['logging_type'];
$summary[t('Application Configuration')] = array(
t('General', 'app.config') => array(
sprintf(
t('Icinga Web 2 will look for modules at: %s'),
$this->pageData['setup_application_config']['global_modulePath']
$this->pageData['setup_general_config']['global_modulePath']
),
sprintf(
$prefType === 'ini' ? sprintf(
@ -170,19 +170,19 @@ class WebInstaller implements Installer
$loggingType === 'syslog' ? 'Syslog' : t('File', 'app.config.logging.type')
)
),
$this->pageData['setup_application_config']['logging_type'] === 'syslog' ? array(
$this->pageData['setup_general_config']['logging_type'] === 'syslog' ? array(
sprintf(
t('Application Prefix: %s'),
$this->pageData['setup_application_config']['logging_application']
$this->pageData['setup_general_config']['logging_application']
),
sprintf(
t('Facility: %s'),
$this->pageData['setup_application_config']['logging_facility']
$this->pageData['setup_general_config']['logging_facility']
)
) : array(
sprintf(
t('Filepath: %s'),
$this->pageData['setup_application_config']['logging_target']
$this->pageData['setup_general_config']['logging_target']
)
)
)