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

N°1647 Fix Excel web queries import. (JS script error popups)

Browse Source
This commit is contained in:
Molkobain
2018-10-03 10:16:15 +02:00
parent cbe749af13
commit 10b7fa6014
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
webservices/export-v2.php
View File

@@ -730,12 +730,20 @@ try
$oExporter = CheckParameters($sExpression, $sQueryId, $sFormat);
$sMimeType = $oExporter->GetMimeType();
if ($sMimeType == 'text/html')
{
// Note: Using NiceWebPage only for HTML export as it includes JS scripts & files, which makes no sense in other export formats. More over, it breaks Excel spreadsheet import.
if($oExporter instanceof HTMLBulkExport)
{
$oP = new NiceWebPage('iTop export');
$oP->add_style("body { overflow: auto; }");
$oP->add_ready_script("$('table.listResults').tablesorter({widgets: ['MyZebra']});");
}
else
{
$oP = new WebPage('iTop export');
}
$oP->add_style("body { overflow: auto; }");
}
else
{
$oP = new ajax_page('iTop export');
$oP->SetContentType($oExporter->GetMimeType());