- Display the full list of attributes (details ZList) when exporting objects in HTML format (useful for Excel Web Queries).

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@737 a333f486-631f-4898-b8df-5754b55c2be0

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))
 		{

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':