From 5e15fbec456e3c5c9a4a46f1589cf06f584b9a22 Mon Sep 17 00:00:00 2001
From: Molkobain <lajarige.guillaume@free.fr>
Date: Mon, 8 Apr 2024 17:03:02 +0200
Subject: [PATCH 1/2] =?UTF-8?q?N=C2=B07312=20-=20Dashboard:=20Fix=20JS=20c?=
 =?UTF-8?q?rash=20on=20custom=20version=20creation=20of=20UserRequest=20Ov?=
 =?UTF-8?q?erview=20page=20on=20Windows=20server?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/dashboard.class.inc.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/dashboard.class.inc.php b/application/dashboard.class.inc.php
index 25072a5526..ebe229fa6f 100644
--- a/application/dashboard.class.inc.php
+++ b/application/dashboard.class.inc.php
@@ -1272,6 +1272,7 @@ EOF
 		$sAutoReloadSec = (string) $this->iAutoReloadSec;
 		$sTitle = utils::HtmlEntities($this->sTitle);
 		$sFile = utils::HtmlEntities($this->GetDefinitionFile());
+		$sFileForJS = json_encode($this->GetDefinitionFile());
 		$sUrl = utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php';
 		$sReloadURL = $this->GetReloadURL();
 
@@ -1333,9 +1334,9 @@ $('#dashboard_editor .ui-layout-center').runtimedashboard({
 	auto_reload: $sAutoReload, 
 	auto_reload_sec: $sAutoReloadSec,
 	submit_to: '$sUrl', 
-	submit_parameters: {operation: 'save_dashboard', file: '$sFile', extra_params: $sJSExtraParams, reload_url: '$sReloadURL'},
+	submit_parameters: {operation: 'save_dashboard', file: {$sFileForJS}, extra_params: $sJSExtraParams, reload_url: '$sReloadURL'},
 	render_to: '$sUrl', 
-	render_parameters: {operation: 'render_dashboard', file: '$sFile', extra_params: $sJSExtraParams, reload_url: '$sReloadURL'},
+	render_parameters: {operation: 'render_dashboard', file: {$sFileForJS}, extra_params: $sJSExtraParams, reload_url: '$sReloadURL'},
 	new_dashlet_parameters: {operation: 'new_dashlet'}
 });
 

From 22af1a8787e94d4ec270cd7e7e023b2580ed178c Mon Sep 17 00:00:00 2001
From: jf-cbd <jimmy.fayolle@combodo.com>
Date: Mon, 8 Apr 2024 17:10:05 +0200
Subject: [PATCH 2/2] Remove namespace for 3.1

---
 sources/Service/Import/CSVImportPageProcessor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources/Service/Import/CSVImportPageProcessor.php b/sources/Service/Import/CSVImportPageProcessor.php
index 0089a110f1..146acf9b30 100644
--- a/sources/Service/Import/CSVImportPageProcessor.php
+++ b/sources/Service/Import/CSVImportPageProcessor.php
@@ -20,7 +20,7 @@ use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
-use Combodo\iTop\Application\WebPage\WebPage;
+use WebPage;
 use Combodo\iTop\Core\CMDBChange\CMDBChangeOrigin;
 use CoreException;
 use CSVParser;