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

N°917: Fix AttributeClassState

Browse Source
This commit is contained in:
Eric
2018-09-27 11:36:41 +02:00
parent ec597f697a
commit 2d24324dea
1 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9701,21 +9701,6 @@ class AttributeSet extends AttributeDBFieldVoid
class AttributeClassAttCodeSet extends AttributeSet
{
/**
* @param \DBObject $oHostObj
*
* @throws \CoreException
*/
public function SetTargetClass($oHostObj)
{
if (!empty($oHostObj))
{
$sTargetClass = $this->Get('class_field');
$sClass = $oHostObj->Get($sTargetClass);
$this->sTargetClass = $sClass;
}
}
static public function ListExpectedParams()
{
return array_merge(parent::ListExpectedParams(), array('class_field', 'attribute_definition_list'));
@@ -9841,21 +9826,23 @@ class AttributeClassAttCodeSet extends AttributeSet
*/
public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
{
$this->SetTargetClass($oHostObject);
if ($value instanceof ormSet)
{
$value = $value->GetValues();
}
if (is_array($value))
{
if (!empty($this->sTargetClass) && $bLocalize)
if (!empty($oHostObject) && $bLocalize)
{
$sTargetClass = $this->Get('class_field');
$sClass = $oHostObject->Get($sTargetClass);
$aLocalizedValues = array();
foreach($value as $sAttCode)
{
try
{
$aLocalizedValues[] = MetaModel::GetLabel($this->sTargetClass, $sAttCode);
$aLocalizedValues[] = MetaModel::GetLabel($sClass, $sAttCode);
} catch (Exception $e)
{
// Ignore bad values