diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index 0efaa6cf6..771f687d5 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -1513,6 +1513,10 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay $aEventsList[] ='validate'; $aEventsList[] ='keyup'; $aEventsList[] ='change'; + if (($iFlags & OPT_ATT_MANDATORY) && (empty($sDisplayValue))) + { + $sDisplayValue = date($oAttDef->GetDateFormat()); + } $sHTMLValue = " {$sValidationField}"; break; @@ -1520,6 +1524,10 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay $aEventsList[] ='validate'; $aEventsList[] ='keyup'; $aEventsList[] ='change'; + if (($iFlags & OPT_ATT_MANDATORY) && (empty($sDisplayValue))) + { + $sDisplayValue = date($oAttDef->GetDateFormat()); + } $sHTMLValue = " {$sValidationField}"; break; diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php index 9331a78c2..fadfde50f 100644 --- a/core/attributedef.class.inc.php +++ b/core/attributedef.class.inc.php @@ -2384,7 +2384,7 @@ class AttributeEnum extends AttributeString */ class AttributeDateTime extends AttributeDBField { - static protected function GetDateFormat() + static public function GetDateFormat() { return "Y-m-d H:i:s"; } @@ -2692,7 +2692,7 @@ class AttributeDate extends AttributeDateTime { const MYDATEFORMAT = "Y-m-d"; - static protected function GetDateFormat() + static public function GetDateFormat() { return "Y-m-d"; }