From 10b7fa6014dfc05a06f9b25affb052c456706220 Mon Sep 17 00:00:00 2001
From: Molkobain <lajarige.guillaume@free.fr>
Date: Wed, 3 Oct 2018 10:16:15 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B01647=20Fix=20Excel=20web=20queries=20imp?=
 =?UTF-8?q?ort.=20(JS=20script=20error=20popups)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webservices/export-v2.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/webservices/export-v2.php b/webservices/export-v2.php
index 26a30a50c..ef7a70fa6 100644
--- a/webservices/export-v2.php
+++ b/webservices/export-v2.php
@@ -731,9 +731,17 @@ try
 		$sMimeType = $oExporter->GetMimeType();
 		if ($sMimeType == 'text/html')
 		{
-			$oP = new NiceWebPage('iTop export');
+			// 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_ready_script("$('table.listResults').tablesorter({widgets: ['MyZebra']});");
+			}
+			else
+			{
+				$oP = new WebPage('iTop export');
+			}
 			$oP->add_style("body { overflow: auto; }");
-			$oP->add_ready_script("$('table.listResults').tablesorter({widgets: ['MyZebra']});");
 		}
 		else
 		{