From 4d040fd761472751555b43305f02f0ada619f9ce Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Fri, 30 Aug 2013 10:37:32 +0200 Subject: [PATCH] Adjust command forms and tests Made those command forms using the DateTimePicker element compatible with its new validation. refs #4581 --- application/forms/Config/LoggingForm.php | 5 +---- test/php/application/forms/Preference/GeneralFormTest.php | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/application/forms/Config/LoggingForm.php b/application/forms/Config/LoggingForm.php index dc90a24d8..5a06994c2 100644 --- a/application/forms/Config/LoggingForm.php +++ b/application/forms/Config/LoggingForm.php @@ -156,10 +156,7 @@ class LoggingForm extends Form 'label' => 'Debug Log Path', 'required' => $this->shouldDisplayDebugLog($debug), 'condition' => $this->shouldDisplayDebugLog($debug), - 'value' => $debug->get( - 'target', - $this->getBaseDir() . '/var/log/icinga2.debug.log' - ), + 'value' => $debug->get('target', $this->getBaseDir() . '/var/log/icinga2.debug.log'), 'helptext' => 'Set the path to the debug log' ) ); diff --git a/test/php/application/forms/Preference/GeneralFormTest.php b/test/php/application/forms/Preference/GeneralFormTest.php index effcdb4f8..51ccd13b4 100644 --- a/test/php/application/forms/Preference/GeneralFormTest.php +++ b/test/php/application/forms/Preference/GeneralFormTest.php @@ -46,7 +46,6 @@ require_once BaseTestCase::$libDir . '/Util/DateTimeFactory.php'; // @codingStandardsIgnoreEnd use \DateTimeZone; -use \Zend_Config; use \Icinga\User\Preferences; use \Zend_View_Helper_DateFormat; use \Icinga\Util\DateTimeFactory;