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

Fix DateTimePicker not respecting user preferences 

refs #4675
This commit is contained in:
Johannes Meyer 2013-09-04 11:24:08 +02:00 committed by Jannis Moßhammer
parent 9a476f16f4
commit e0620aa04e
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,17 +4,15 @@
// {{{ICINGA_LICENSE_HEADER}}}
// {{{ICINGA_LICENSE_HEADER}}}
use \DateTime;
use \Icinga\Application\Icinga;
use \Icinga\Application\Config as IcingaConfig;
use \Icinga\Application\Config;
use \Icinga\Util\DateTimeFactory;
use \Zend_Controller_Request_Http;
use \Icinga\Web\Form\Validator\DateTimeValidator;
/**
* Helper to format date and time. Utilizes DateTimeFactory to ensure time zone awareness
*
* @see \Icinga\Util\DateTimeFactory::create()
* @see DateTimeFactory::create()
*/
class Zend_View_Helper_DateFormat extends Zend_View_Helper_Abstract
{
@ -110,7 +108,7 @@ class Zend_View_Helper_DateFormat extends Zend_View_Helper_Abstract
public function getDateFormat()
{
return $this->request->getUser()->getPreferences()->get(
'dateFormat', IcingaConfig::app()->global->get('dateFormat', 'Y-m-d')
'app.dateFormat', Config::app()->global->get('dateFormat', 'd/m/Y')
);
}
@ -122,7 +120,7 @@ class Zend_View_Helper_DateFormat extends Zend_View_Helper_Abstract
public function getTimeFormat()
{
return $this->request->getUser()->getPreferences()->get(
'timeFormat', IcingaConfig::app()->global->get('timeFormat', 'H:i:s')
'app.timeFormat', Config::app()->global->get('timeFormat', 'g:i A')
);
}