Refactoring for AttributeDateTime in the portal

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@4020 a333f486-631f-4898-b8df-5754b55c2be0

core/attributedef.class.inc.php

@@ -1304,7 +1304,7 @@ class AttributeLinkedSet extends AttributeDefinition
 		$aAttCodesToDisplay = MetaModel::FlattenZList(MetaModel::GetZListItems($sTargetClass, 'list'));
 		// - Adding friendlyname attribute to the list is not already in it
 		$sTitleAttCode = MetaModel::GetFriendlyNameAttributeCode($sTargetClass);
-		if (!in_array($sTitleAttCode, $aAttCodesToDisplay))
+		if (($sTitleAttCode !== null) && !in_array($sTitleAttCode, $aAttCodesToDisplay))
 		{
 			$aAttCodesToDisplay = array_merge(array($sTitleAttCode), $aAttCodesToDisplay);
 		}
@@ -3320,7 +3320,7 @@ class AttributeEnum extends AttributeString
 
 	static public function GetFormFieldClass()
 	{
-		return '\\Combodo\\iTop\\Form\\Field\\RadioField';
+		return '\\Combodo\\iTop\\Form\\Field\\SelectField';
 	}
 
 	public function MakeFormField(DBObject $oObject, $oFormField = null)
@@ -3640,9 +3640,9 @@ class AttributeDateTime extends AttributeDBField
 	public function MakeFormField(DBObject $oObject, $oFormField = null)
 	{
 		$oFormField = parent::MakeFormField($oObject, $oFormField);
-		$oFormField->SetPHPDateTimeFormat($this->GetFormat());
-		$oFormField->SetJSDateTimeFormat($this->GetMomentJSFormat());
-		
+		$oFormField->SetPHPDateTimeFormat((string) $this->GetFormat());
+		$oFormField->SetJSDateTimeFormat($this->GetFormat()->ToMomentJS());
+
 		return $oFormField;
 	}
 

sources/form/field/datetimefield.class.inc.php

@@ -19,6 +19,7 @@
 
 namespace Combodo\iTop\Form\Field;
 
+use \AttributeDatetime;
 use \Combodo\iTop\Form\Field\StringField;
 
 /**
@@ -71,6 +72,6 @@ class DateTimeField extends StringField
 	
 	public function GetDisplayValue()
 	{
-		return \AttributeDatetime::Format($this->currentValue, $this->GetPHPDateTimeFormat());
+		return AttributeDatetime::GetFormat()->Format($this->currentValue);
 	}
 }