tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-30 01:04:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix that the preference configuration does not handle defaults properly

Browse Source
This commit is contained in:
Johannes Meyer 2014-04-07 15:03:08 +02:00
parent 072f157064
commit 6692f253fd
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
application/forms/Preference/GeneralForm.php
View File

@ -97,7 +97,7 @@ class GeneralForm extends Form
'default_language', 'default_language',
array( array(
'label' => t('Use Default Language'), 'label' => t('Use Default Language'),
'value' => !$prefs->has('app.language'), 'value' => $useDefaultLanguage,
'required' => true 'required' => true
) )
); );
@ -148,7 +148,7 @@ class GeneralForm extends Form
'default_timezone', 'default_timezone',
array( array(
'label' => 'Use Default Timezone', 'label' => 'Use Default Timezone',
'value' => !$prefs->has('app.timezone'), 'value' => $useGlobalTimezone,
'required' => true 'required' => true
) )
); );
@ -180,7 +180,7 @@ class GeneralForm extends Form
'default_date_format', 'default_date_format',
array( array(
'label' => 'Use Default Date Format', 'label' => 'Use Default Date Format',
'value' => !$prefs->has('app.dateFormat'), 'value' => $useGlobalDateFormat,
'required' => true 'required' => true
) )
); );
@ -210,7 +210,7 @@ class GeneralForm extends Form
'default_time_format', 'default_time_format',
array( array(
'label' => 'Use Default Time Format', 'label' => 'Use Default Time Format',
'value' => !$prefs->has('app.timeFormat'), 'value' => $useGlobalTimeFormat,
'required' => !$useGlobalTimeFormat 'required' => !$useGlobalTimeFormat
) )
); );
@ -277,10 +277,10 @@ class GeneralForm extends Form
{ {
$values = $this->getValues(); $values = $this->getValues();
return array( return array(
'app.language' => $values['language'], 'app.language' => $values['default_language'] ? null : $values['language'],
'app.timezone' => $values['timezone'], 'app.timezone' => $values['default_timezone'] ? null : $values['timezone'],
'app.dateFormat' => $values['date_format'], 'app.dateFormat' => $values['default_date_format'] ? null : $values['date_format'],
'app.timeFormat' => $values['time_format'], 'app.timeFormat' => $values['default_time_format'] ? null : $values['time_format'],
'app.showBenchmark' => $values['showBenchmark'] === '1' ? true : false 'app.showBenchmark' => $values['showBenchmark'] === '1' ? true : false
); );
} }