From bc770ef3d58932b51f2843f56df9c0fa33ff2b69 Mon Sep 17 00:00:00 2001
From: acognet <anne-catherine.cognet@combodo.com>
Date: Thu, 5 Aug 2021 16:20:10 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B04007=20-=20When=20a=20search=20is=20on?=
 =?UTF-8?q?=20auto=20submit,=20auto=20submit=20it=20also=20on=20first=20di?=
 =?UTF-8?q?splay=20-=20new=20fix=20in=20order=20to=20avoid=20reload=20in?=
 =?UTF-8?q?=20case=20of=20OQLMenuNode=20-add=20param=20in=20searchFormHand?=
 =?UTF-8?q?ler?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/displayblock.class.inc.php        |  4 ++
 application/menunode.class.inc.php            | 38 +------------------
 js/search/search_form_handler.js              |  5 ++-
 .../search/searchform.class.inc.php           |  2 +
 4 files changed, 10 insertions(+), 39 deletions(-)

diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php
index f60d2240c..2520a029c 100644
--- a/application/displayblock.class.inc.php
+++ b/application/displayblock.class.inc.php
@@ -192,6 +192,8 @@ class DisplayBlock
 				/** string */
 				'open',
 				/** bool open by default the search */
+				'submit_on_load',
+				/** bool submit the search on loading page */
 				'class', /** class name */
 				'search_header_force_dropdown', /** Html for <select> to choose the class to search  */
 				'this',
@@ -201,6 +203,8 @@ class DisplayBlock
 				/** string search root class */
 				'open',
 				/** bool open the search panel by default */
+				'submit_on_load',
+				/** bool submit the search on loading page */
 				'result_list_outer_selector',
 				/** string js selector of the search result display */
 				'search_header_force_dropdown',
diff --git a/application/menunode.class.inc.php b/application/menunode.class.inc.php
index b924a198c..8dd01787e 100644
--- a/application/menunode.class.inc.php
+++ b/application/menunode.class.inc.php
@@ -1128,21 +1128,11 @@ class OQLMenuNode extends MenuNode
 		//$sIcon = MetaModel::GetClassIcon($oSearch->GetClass(), false);
 
 		if ($bSearchPane) {
-			$aParams = array_merge(array('open' => $bSearchOpen, 'table_id' => $sUsageId), $aExtraParams);
+			$aParams = array_merge(['open' => $bSearchOpen, 'table_id' => $sUsageId, 'submit_on_load' => true], $aExtraParams);
 			$oBlock = new DisplayBlock($oSearch, 'search', false /* Asynchronous */, $aParams);
 			$oBlock->Display($oPage, 0);
 		}
 
-		$oPage->add("<div class='sf_results_area' data-target='search_results'>");
-		$oTitle = TitleUIBlockFactory::MakeForPage($sTitle);
-		$oPage->AddUiBlock($oTitle);
-
-		$aParams = array_merge(array('table_id' => $sUsageId), $aExtraParams);
-		$oBlock = new DisplayBlock($oSearch, 'list', false /* Asynchronous */, $aParams);
-		$oBlock->Display($oPage, $sUsageId);
-
-		$oPage->add("</div>");
-
 		if ($bEnableBreadcrumb && ($oPage instanceof iTopWebPage)) {
 			// Breadcrumb
 			//$iCount = $oBlock->GetDisplayedCount();
@@ -1212,32 +1202,6 @@ class SearchMenuNode extends MenuNode
 		$aParams = array_merge(array('table_id' =>$sUsageId), $aExtraParams);
 		$oBlock = new DisplayBlock($oSearch, 'search', false /* Asynchronous */, $aParams);
 		$oBlock->Display($oPage, 0);
-
-		$bAutoSubmit = true;
-		$mSubmitParam = utils::GetConfig()->Get('search_manual_submit');
-		if ($mSubmitParam !== false)
-		{
-			$bAutoSubmit = false;
-		}
-		else
-		{
-			$mSubmitParam = utils::GetConfig()->Get('high_cardinality_classes');
-			if (is_array($mSubmitParam)) {
-				if (in_array( $oSearch->GetClass(), $mSubmitParam)) {
-					$bAutoSubmit = false;
-				}
-			}
-		}
-		if($bAutoSubmit) {
-			$oPage->add("<div class='sf_results_area' data-target='search_results'>");
-
-			$aParams = array_merge(array('table_id' =>$sUsageId), $aExtraParams);
-			$oBlock = new DisplayBlock($oSearch, 'list', false /* Asynchronous */, $aParams);
-			$oBlock->Display($oPage, $sUsageId);
-
-			$oPage->add("</div>");
-		}
-
 	}
 }
 
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index a6d897fa6..7828e84c7 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -15,6 +15,7 @@ $(function()
 			'endpoint': null,
 			'init_opened': false,
 			'auto_submit': true,
+			'submit_on_load': false,
 			'show_obsolete_data' : true,
 			'search': {
 				'base_oql': '',
@@ -127,10 +128,10 @@ $(function()
             });
 
 			// If auto submit is enabled, also submit on first display
-			/*if(this.options.auto_submit === true)
+			if(this.options.auto_submit === true || this.options.submit_on_load === true)
 			{
 				this._submit();
-			}*/
+			}
 
 		},
 		// called when created, and later when changing options
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 623818860..158578afa 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -227,6 +227,7 @@ class SearchForm
 		{
 			$aListParams['table_inner_id'] = "table_inner_id_{$sSearchFormId}";
 		}
+		$bSubmitOnLoad =  (isset($aExtraParams['submit_on_load'])) ? $aExtraParams['submit_on_load'] : false;
 
 		$sDebug = utils::ReadParam('debug', 'false', false, 'parameter');
 		if ($sDebug == 'true')
@@ -250,6 +251,7 @@ class SearchForm
 			'data_config_list_selector' => "#{$aExtraParams['result_list_outer_selector']}",
 			'endpoint' => utils::GetAbsoluteUrlAppRoot().'pages/ajax.searchform.php?'.$sContext,
 			'init_opened' => $bOpen,
+			'submit_on_load' => $bSubmitOnLoad,
 			'auto_submit' => $bAutoSubmit,
 			'list_params' => $aListParams,
 			'show_obsolete_data' => $bShowObsoleteData,