From d69163199b8d072467e78edb8f2d41b8dd97fad5 Mon Sep 17 00:00:00 2001
From: Denis Flaven <denis.flaven@combodo.com>
Date: Fri, 30 Nov 2012 10:51:15 +0000
Subject: [PATCH] Fix for Trac #569: Mandatory date (and time) fields are
 prefilled with the current date (and time).

SVN:trunk[2483]
---
 application/cmdbabstract.class.inc.php | 8 ++++++++
 core/attributedef.class.inc.php        | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

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 = "<input title=\"$sHelpText\" class=\"date-pick\" type=\"text\" size=\"12\" name=\"attr_{$sFieldPrefix}{$sAttCode}{$sNameSuffix}\" value=\"".htmlentities($sDisplayValue, ENT_QUOTES, 'UTF-8')."\" id=\"$iId\"/>&nbsp;{$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 = "<input title=\"$sHelpText\" class=\"datetime-pick\" type=\"text\" size=\"20\" name=\"attr_{$sFieldPrefix}{$sAttCode}{$sNameSuffix}\" value=\"".htmlentities($sDisplayValue, ENT_QUOTES, 'UTF-8')."\" id=\"$iId\"/>&nbsp;{$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";
 	}