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

- Fixed a regression introduced by revision [737]

Browse Source 
SVN:trunk[744]
This commit is contained in:
Denis Flaven
2010-09-02 11:21:38 +00:00
parent d813a7b10d
commit 16baa35ad4
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
application/cmdbabstract.class.inc.php
View File

@@ -382,7 +382,7 @@ abstract class cmdbAbstractObject extends CMDBObject
$sClassName = $oSet->GetFilter()->GetClass();
$aAttribs = array();
$sZListName = isset($aExtraParams['zlist']) ? ($aExtraParams['zlist']) : 'list';
$aList = self::FlattenZList(MetaModel::GetZListItems($sClassName, '$sZListName'));
$aList = self::FlattenZList(MetaModel::GetZListItems($sClassName, $sZListName));
$aList = array_merge($aList, $aExtraFields);
if (!empty($sLinkageAttribute))
{
@@ -390,6 +390,7 @@ abstract class cmdbAbstractObject extends CMDBObject
// and other objects...
// The display will then group all the attributes related to the link itself:
// | Link_attr1 | link_attr2 | ... || Object_attr1 | Object_attr2 | Object_attr3 | .. | Object_attr_n |
$aDisplayList = array();
$aAttDefs = MetaModel::ListAttributeDefs($sClassName);
assert(isset($aAttDefs[$sLinkageAttribute]));
$oAttDef = $aAttDefs[$sLinkageAttribute];