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

DateTime: Remove global and user formattings 

refs #6077
This commit is contained in:
Marius Hein 2014-09-04 15:55:28 +02:00
parent 6739034a14
commit 6fcf5ec88a
4 changed files with 10 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
application/views/helpers/DateFormat.php
View File

@ -3,7 +3,6 @@
// {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}}
use Icinga\Application\Icinga; use Icinga\Application\Icinga;
use Icinga\Application\Config;
use Icinga\Util\DateTimeFactory; use Icinga\Util\DateTimeFactory;
use Icinga\Web\Form\Validator\DateTimeValidator; use Icinga\Web\Form\Validator\DateTimeValidator;
@ -109,10 +108,8 @@ class Zend_View_Helper_DateFormat extends Zend_View_Helper_Abstract
*/ */
public function getDateFormat() public function getDateFormat()
{ {
return $this->request->getUser()->getPreferences()->get( // TODO(mh): Missing localized format (#6077)
'app.dateFormat', return 'd/m/Y';
Config::app()->global !== null ? Config::app()->global->get('dateFormat', 'd/m/Y') : 'd/m/Y'
);
} }
/** /**
@ -122,10 +119,8 @@ class Zend_View_Helper_DateFormat extends Zend_View_Helper_Abstract
*/ */
public function getTimeFormat() public function getTimeFormat()
{ {
return $this->request->getUser()->getPreferences()->get( // TODO(mh): Missing localized format (#6077)
'app.timeFormat', return 'g:i A';
Config::app()->global !== null ? Config::app()->global->get('timeFormat', 'g:i A') : 'g:i A'
);
} }
/** /**

2
config/config.ini.in
View File

@ -1,7 +1,5 @@
[global] [global]
timezone = "Europe/Berlin" timezone = "Europe/Berlin"
dateFormat = "d/m/Y"
timeFormat = "g:i A"
; Contains the directories that will be searched for available modules. Modules that ; Contains the directories that will be searched for available modules. Modules that
; don't exist in these directories can still be symlinked in the module folder, but ; don't exist in these directories can still be symlinked in the module folder, but

10
modules/monitoring/application/controllers/TimelineController.php
View File

@ -278,9 +278,8 @@ class Monitoring_TimelineController extends Controller
*/ */
private function getTimeFormat() private function getTimeFormat()
{ {
$globalConfig = $this->getGlobalConfiguration(); // TODO(mh): Missing localized format (#6077)
$preferences = $this->getRequest()->getUser()->getPreferences(); return 'g:i A';
return $preferences->get('app.timeFormat', $globalConfig->get('timeFormat', 'g:i A'));
} }
/** /**
@ -290,8 +289,7 @@ class Monitoring_TimelineController extends Controller
*/ */
private function getDateFormat() private function getDateFormat()
{ {
$globalConfig = $this->getGlobalConfiguration(); // TODO(mh): Missing localized format (#6077)
$preferences = $this->getRequest()->getUser()->getPreferences(); return 'd/m/Y';
return $preferences->get('app.dateFormat', $globalConfig->get('dateFormat', 'd/m/Y'));
} }
} }

17
modules/monitoring/application/forms/Command/CommandForm.php
View File

@ -115,21 +115,8 @@ abstract class CommandForm extends Form
*/ */
public function getValidDateTimeFormats() public function getValidDateTimeFormats()
{ {
$config = $this->getConfiguration(); // TODO(mh): Missing localized format (#6077)
$global = $config->global; return 'd/m/Y g:i A';
if ($global === null) {
$global = new Zend_Config(array());
}
$preferences = $this->getUserPreferences();
return array(
implode(
' ',
array(
$preferences->get('app.dateFormat', $global->get('dateFormat', 'd/m/Y')),
$preferences->get('app.timeFormat', $global->get('timeFormat', 'g:i A'))
)
)
);
} }
/** /**