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

Refactoring for AttributeDateTime in the portal

Browse Source 
SVN:trunk[4020]
This commit is contained in:
Guillaume Lajarige
2016-05-03 14:40:56 +00:00
parent 5386662146
commit f247b89342
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

3
sources/form/field/datetimefield.class.inc.php
View File

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