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

#485 Improved the end-user experience with Excel and the web queries (added a phrasebook) + link to test the OQL attributes (query phrasebook or email actions, etc.) including the handlink of query arguments) + fixed wrong prototypes for a few implementations of GetBareProperties()

Browse Source 
SVN:trunk[1716]
This commit is contained in:
Romain Quetiez
2011-12-14 17:23:01 +00:00
parent ec19ef982e
commit ea10d202a6
13 changed files with 156 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
webservices/export.php
View File

@@ -55,6 +55,22 @@ $currentOrganization = utils::ReadParam('org_id', '');
// Main program
$sExpression = utils::ReadParam('expression', '', true /* Allow CLI */, 'raw_data');
if (strlen($sExpression) == 0)
{
$sQueryId = trim(utils::ReadParam('query', '', true /* Allow CLI */, 'raw_data'));
if (strlen($sQueryId) > 0)
{
$oSearch = DBObjectSearch::FromOQL('SELECT QueryOQL WHERE id = :query_id', array('query_id' => $sQueryId));
$oQueries = new DBObjectSet($oSearch);
if ($oQueries->Count() > 0)
{
$oQuery = $oQueries->Fetch();
$sExpression = $oQuery->Get('oql');
}
}
}
$sFormat = strtolower(utils::ReadParam('format', 'html'));
$sFields = utils::ReadParam('fields', '', true, 'raw_data'); // CSV field list (allows to specify link set attributes, still not taken into account for XML export)
@@ -76,9 +92,21 @@ if (!empty($sExpression))
try
{
$oFilter = DBObjectSearch::FromOQL($sExpression);
$aArgs = array();
foreach($oFilter->GetQueryParams() as $sParam => $foo)
{
$value = utils::ReadParam('arg_'.$sParam, null, true, 'raw_data');
if (!is_null($value))
{
$aArgs[$sParam] = $value;
}
}
$oFilter->SetInternalParams($aArgs);
if ($oFilter)
{
$oSet = new CMDBObjectSet($oFilter);
$oSet = new CMDBObjectSet($oFilter, array(), $aArgs);
switch($sFormat)
{
case 'html':
@@ -164,7 +192,9 @@ if (!$oP)
$oP->p("<strong>General purpose export page.</strong>");
$oP->p("<strong>Parameters:</strong>");
$oP->p("<ul><li>expression: an OQL expression (URL encoded if needed)</li>
<li>format: (optional, default is html) the desired output format. Can be one of 'html', 'csv' or 'xml'</li>
<li>query: (alternative to 'expression') the id of an entry from the query phrasebook</li>
<li>arg_xxx: (needed if the query has parameters) the value of the parameter 'xxx'</li>
<li>format: (optional, default is html) the desired output format. Can be one of 'html', 'spreadsheet', 'csv' or 'xml'</li>
<li>fields: (optional, no effect on XML format) list of fields (attribute codes) separated by a coma</li>
</ul>");
}