From 22aef82b830fb413ef5a6a1cfb5366f8a85bd9f2 Mon Sep 17 00:00:00 2001
From: Denis Flaven <denis.flaven@combodo.com>
Date: Wed, 1 Sep 2010 10:52:08 +0000
Subject: [PATCH] - Display the full list of attributes (details ZList) when
 exporting objects in HTML format (useful for Excel Web Queries).

SVN:trunk[737]
---
 application/cmdbabstract.class.inc.php | 3 ++-
 webservices/export.php                 | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

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