From e376f132634355e8b6364ae7ced14086d3674f6a Mon Sep 17 00:00:00 2001
From: acognet <anne-catherine.cognet@combodo.com>
Date: Thu, 11 Mar 2021 10:35:19 +0100
Subject: [PATCH] =?UTF-8?q?N=C2=B03787=20-=20Use=20data=20loader=20for=20a?=
 =?UTF-8?q?uto=20refresh?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/dataTables.pipeline.js                     | 41 ++++++++++++-------
 .../DataTable/DataTableUIBlockFactory.php     |  5 ++-
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/js/dataTables.pipeline.js b/js/dataTables.pipeline.js
index f9be0d690..c626a40b6 100644
--- a/js/dataTables.pipeline.js
+++ b/js/dataTables.pipeline.js
@@ -30,22 +30,33 @@ $.fn.dataTable.pipeline = function (opts) {
 		if (this.find('tbody').find('td').length == 0) {
 			this.find('tbody').append('<tr class="ibo-dataTables--processing"><td>&#160;</td></tr>');
 			this.find('tbody').append('<tr class="ibo-dataTables--processing"><td>&#160;</td></tr>');
+			this.find('tbody').block({
+				message: message,
+				css: {
+					border: '0px '
+				}
+			});
+			this.find('thead').block({
+				message: '',
+				css: {
+					border: '0px '
+				}
+			});
+		} else {
+			this.find('tbody').block({
+				message: '',
+				css: {
+					border: '0px '
+				}
+			});
+			this.find('thead').block({
+				message: message,
+				css: {
+					border: '0px ',
+					top: '20px',
+				}
+			});
 		}
-
-		this.find('tbody').block({
-			message: message,
-			css: {
-				border: '0px ',
-				top: '20px',
-			}
-		});
-		this.find('thead').block({
-			message: message,
-			css: {
-				border: '0px ',
-				top: '20px',
-			}
-		});
 		var ajax = false;
 		var requestStart = request.start;
 		var drawStart = request.start;
diff --git a/sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php b/sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php
index f40e1367a..6acd13cc9 100644
--- a/sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php
+++ b/sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php
@@ -108,7 +108,7 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
 	{
 		if (!isset($aExtraParams['menu']) || $aExtraParams['menu']) {
 			$oMenuBlock = new MenuBlock($oSet->GetFilter(), $sStyle);
-			$aExtraParams['sRefreshAction'] = $oDataTable->GetJSRefresh()[0];
+			$aExtraParams['sRefreshAction'] = $oDataTable->GetJSRefresh();
 			$oBlockMenu = $oMenuBlock->GetRenderContent($oPage, $aExtraParams, $sListId);
 		} else {
 			$bToolkitMenu = true;
@@ -386,12 +386,13 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
 			$aOptions['iPageSize'] = $oCustomSettings->iDefaultPageSize;
 		}
 
+		$aOptions['processing'] = true;
 		$aOptions['sTableId'] = $sTableId;
 		$aOptions['bUseCustomSettings'] = $bUseCustomSettings;
 		$aOptions['bViewLink'] = $bViewLink;
 		$aOptions['sListId'] = $sListId;
 		$aOptions['oClassAliases'] = json_encode($aClassAliases);
-		if (isset($aExtraParams['selected_rows']) && !empty($aExtraParams['selected_rows'])){
+		if (isset($aExtraParams['selected_rows']) && !empty($aExtraParams['selected_rows'])) {
 			$aOptions['sSelectedRows'] = json_encode($aExtraParams['selected_rows']);
 		} else {
 			$aOptions['sSelectedRows'] = '[]';