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

N°1408: Fix AttributeDashboard for portal

Browse Source
This commit is contained in:
Stephen Abello
2018-11-14 12:11:42 +01:00
parent b898a09c4c
commit d344478b48
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1299,6 +1299,14 @@ class AttributeDashboard extends AttributeDefinition
{
return '';
}
/**
* @inheritdoc
*/
public function MakeFormField(DBObject $oObject, $oFormField = null)
{
return null;
}
}
/**

14
datamodels/2.x/itop-portal-base/portal/src/forms/objectformmanager.class.inc.php
View File

@@ -600,13 +600,17 @@ class ObjectFormManager extends FormManager
foreach ($aFieldsAtts as $sAttCode => $iFieldFlags)
{
$oAttDef = MetaModel::GetAttributeDef(get_class($this->oObject), $sAttCode);
// Failsafe for AttributeType that would not have MakeFormField and therefore could not be used in a form
/** @var Field $oField */
$oField = null;
if (is_callable(get_class($oAttDef) . '::MakeFormField'))
{
/** @var Field $oField */
$oField = $oAttDef->MakeFormField($this->oObject);
}
// Failsafe for AttributeType that would not have MakeFormField and therefore could not be used in a form
if($oField !== null)
{
if ($this->sMode !== static::ENUM_MODE_VIEW)
{
// Field dependencies
@@ -816,7 +820,7 @@ class ObjectFormManager extends FormManager
$oField = new LabelField($sAttCode);
$oField->SetReadOnly(true)
->SetHidden(false)
->SetCurrentValue(get_class($oAttDef) . ' : Sorry, that AttributeType is not implemented yet.')
->SetCurrentValue('Sorry, that AttributeType is not implemented yet.')
->SetLabel($oAttDef->GetLabel());
}