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

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

Browse Source 
SVN:trunk[737]
This commit is contained in:
Denis Flaven
2010-09-01 10:52:08 +00:00
parent 79ab5d6b75
commit 22aef82b83
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -381,7 +381,8 @@ abstract class cmdbAbstractObject extends CMDBObject
$oAppContext = new ApplicationContext(); $oAppContext = new ApplicationContext();
$sClassName = $oSet->GetFilter()->GetClass(); $sClassName = $oSet->GetFilter()->GetClass();
$aAttribs = array(); $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); $aList = array_merge($aList, $aExtraFields);
if (!empty($sLinkageAttribute)) if (!empty($sLinkageAttribute))
{ {

2
webservices/export.php
View File

@@ -70,7 +70,7 @@ if (!empty($sExpression))
} }
$sUrl = "$sProtocol://{$sServerName}{$sPort}/pages/"; $sUrl = "$sProtocol://{$sServerName}{$sPort}/pages/";
$oP->set_base($sUrl); $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; break;
case 'csv': case 'csv':