composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix for Trac #569: Mandatory date (and time) fields are prefilled with the current date (and time).

Browse Source 
SVN:trunk[2483]
This commit is contained in:
Denis Flaven
2012-11-30 10:51:15 +00:00
parent b563a64eb6
commit d69163199b
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
application/cmdbabstract.class.inc.php
View File

@@ -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;

4
core/attributedef.class.inc.php
View File

@@ -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";
}