diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index f25cfefe2..574840b8f 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -381,7 +381,8 @@ abstract class cmdbAbstractObject extends CMDBObject $oAppContext = new ApplicationContext(); $sClassName = $oSet->GetFilter()->GetClass(); $aAttribs = array(); - $aList = MetaModel::GetZListItems($sClassName, 'list'); + $sZListName = isset($aExtraParams['zlist']) ? ($aExtraParams['zlist']) : 'list'; + $aList = self::FlattenZList(MetaModel::GetZListItems($sClassName, '$sZListName')); $aList = array_merge($aList, $aExtraFields); if (!empty($sLinkageAttribute)) { diff --git a/webservices/export.php b/webservices/export.php index 8469754d9..e6743ba61 100644 --- a/webservices/export.php +++ b/webservices/export.php @@ -70,7 +70,7 @@ if (!empty($sExpression)) } $sUrl = "$sProtocol://{$sServerName}{$sPort}/pages/"; $oP->set_base($sUrl); - cmdbAbstractObject::DisplaySet($oP, $oSet, array('menu' => false, 'display_limit' => false)); // no menu, no truncated list + cmdbAbstractObject::DisplaySet($oP, $oSet, array('menu' => false, 'display_limit' => false, 'zlist' => 'details')); // no menu, no truncated list, "details" zlist break; case 'csv':