From fb31c9006ac972a0f9352fabcbe08e0616827b36 Mon Sep 17 00:00:00 2001
From: Eric <eric.espie@combodo.com>
Date: Wed, 10 Oct 2018 15:03:17 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B01408=20-=20Fix=20import=20dashboard?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/dashboard.class.inc.php | 10 ++++------
 application/utils.inc.php           |  5 -----
 js/dashboard.js                     |  8 +++++---
 pages/ajax.render.php               |  2 +-
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/application/dashboard.class.inc.php b/application/dashboard.class.inc.php
index 5828a80f2..6d6278422 100644
--- a/application/dashboard.class.inc.php
+++ b/application/dashboard.class.inc.php
@@ -846,13 +846,11 @@ EOF
 		if ($this->bCustomized)
 		{
 			$oRevert = new JSPopupMenuItem('UI:Dashboard:RevertConfirm', Dict::S('UI:Dashboard:Revert'),
-											"if (confirm('".addslashes(Dict::S('UI:Dashboard:RevertConfirm'))."')) return RevertDashboard('{$this->sId}'); else return false");
+											"if (confirm('".addslashes(Dict::S('UI:Dashboard:RevertConfirm'))."')) return RevertDashboard('{$this->sId}', $sJSExtraParams); else return false");
 			$aActions[$oRevert->GetUID()] = $oRevert->GetMenuItem();
 		}
 		utils::GetPopupMenuItems($oPage, iPopupMenuExtension::MENU_DASHBOARD_ACTIONS, $this, $aActions);
 		$sEditMenu .= $oPage->RenderPopupMenuItems($aActions);
-				
-
 		$sEditMenu = addslashes($sEditMenu);
 
 		$oPage->add_ready_script(
@@ -874,12 +872,12 @@ function EditDashboard(sId, sDashboardFile, aExtraParams)
 	);
 	return false;
 }
-function RevertDashboard(sId)
+function RevertDashboard(sId, aExtraParams)
 {
-	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', {operation: 'revert_dashboard', dashboard_id: sId},
+	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', {operation: 'revert_dashboard', dashboard_id: sId, extra_params: aExtraParams},
 		function(data)
 		{
-			$('body').append(data);
+			location.reload();
 		}
 	);
 	return false;
diff --git a/application/utils.inc.php b/application/utils.inc.php
index cdc4374b1..7d5dfc4b8 100644
--- a/application/utils.inc.php
+++ b/application/utils.inc.php
@@ -1079,12 +1079,7 @@ class utils
 			// $param is a DBObject
 			$oObj = $param;
 			$sOQL = "SELECT ".get_class($oObj)." WHERE id=".$oObj->GetKey();
-			$oFilter = DBObjectSearch::FromOQL($sOQL);
-			$sFilter = $oFilter->serialize();
 			$sUrl = ApplicationContext::MakeObjectUrl(get_class($oObj), $oObj->GetKey());
-			$sUIPage = cmdbAbstractObject::ComputeStandardUIPage(get_class($oObj));
-			$oAppContext = new ApplicationContext();
-			$sContext = $oAppContext->GetForLink();
 			$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/tabularfieldsselector.js');
 			$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.dragtable.js');
 			$oPage->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/dragtable.css');
diff --git a/js/dashboard.js b/js/dashboard.js
index ba8fed4bd..77c8a2ab8 100644
--- a/js/dashboard.js
+++ b/js/dashboard.js
@@ -347,6 +347,7 @@ $(function()
 function UploadDashboard(oOptions)
 {
 	var sFileId = 'dashboard_upload_file';
+
 	var oDlg = $('<div id="dashboard_upload_dlg"><form><p>'+oOptions.text+'</p><p><input type="file" id="'+sFileId+'" name="dashboard_upload_file"></p></form></div>');
 	$('body').append(oDlg);
 	oOptions.file_id = sFileId;
@@ -371,6 +372,7 @@ $(function()
 		{
 			dashboard_id: '',
 			file_id: '',
+			file: '',
 			text: 'Select a dashboard file to import',
 			title: 'Dahsboard Import',
 			close_btn: 'Close',
@@ -388,13 +390,13 @@ $(function()
 				//me.onClose();
 			};
 			$('#'+this.options.file_id).fileupload({
-				url: me.options.submit_to+'&id='+me.options.dashboard_id,
+				url: me.options.submit_to+'&id='+me.options.dashboard_id+'&file='+me.options.file,
 		        dataType: 'json',
 				pasteZone: null, // Don't accept files via Chrome's copy/paste
 		        done: function (e, data) {
-					if(typeof(data.result.error) != 'undefined')
+					if(typeof(data.result.error) !== 'undefined')
 					{
-						if(data.result.error != '')
+						if(data.result.error !== '')
 						{
 							alert(data.result.error);
 							me.element.dialog('close');
diff --git a/pages/ajax.render.php b/pages/ajax.render.php
index dbee2e935..078dbf34d 100644
--- a/pages/ajax.render.php
+++ b/pages/ajax.render.php
@@ -945,7 +945,7 @@ try
 			}
 			else
 			{
-				$aResult['error'] = 'Dashboard id="'.$sMenuId.'" not found.';
+				$aResult['error'] = 'Dashboard id="'.$sDashboardId.'" not found.';
 			}
 			$oPage->add(json_encode($aResult));
 			break;