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

#854...ROLLBACK, undoing the commit [3185]. The implementation has been postponed to the next major relase.

Browse Source 
SVN:trunk[3255]
This commit is contained in:
Romain Quetiez
2014-07-09 09:49:02 +00:00
parent f6d0bda737
commit 5f5125a131
9 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2510,16 +2510,18 @@ class AttributeDateTime extends AttributeDBField
return $iUnixSeconds;
}
// This has been done at the time when itop was using TIMESTAMP columns,
// now that iTop is using DATETIME columns, it seems possible to have IsNullAllowed returning false... later when this is needed
public function IsNullAllowed() {return true;}
public function GetDefaultValue()
{
$default = parent::GetDefaultValue();
if (!empty($default))
if (!parent::IsNullAllowed())
{
$iDate = strtotime($default);
if ($iDate !== false)
if (empty($default))
{
$default = date($this->GetDateFormat(), $iDate);
$default = date($this->GetDateFormat());
}
}