From e120b149dcaf9379c2a5eb98c5458422bb93ccd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Tue, 20 Mar 2018 12:50:30 +0000
Subject: [PATCH] Advanced Search: Fix shortcut menu with sub-classes

SVN:b1162[5465]
---
 js/utils.js                                         | 3 ++-
 sources/application/search/searchform.class.inc.php | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/js/utils.js b/js/utils.js
index c1659166e..aded8c386 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -170,7 +170,7 @@ function UpdateFileName(id, sNewFileName) {
 /**
  * Reload a search form for the specified class
  */
-function ReloadSearchForm(divId, sClassName, sBaseClass, sContext) {
+function ReloadSearchForm(divId, sClassName, sBaseClass, sContext, sTableId) {
 	var oDiv = $('#ds_'+divId);
 	oDiv.block();
 	// deprecated in jQuery 1.8 
@@ -196,6 +196,7 @@ function ReloadSearchForm(divId, sClassName, sBaseClass, sContext) {
 	oMap.className = sClassName;
 	oMap.baseClass = sBaseClass;
 	oMap.currentId = divId;
+	oMap._table_id_ = sTableId;
 	oMap.action = sAction;
 
 	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?'+sContext, oMap,
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 0229bd757..69d82b1e0 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -107,7 +107,7 @@ class SearchForm
 			$aOptions[MetaModel::GetName($sClassName)] = "<option selected value=\"$sClassName\">".MetaModel::GetName($sClassName)."</options>\n";
 			ksort($aOptions);
 			$sContext = $oAppContext->GetForLink();
-			$sClassesCombo = "<select name=\"class\" onChange=\"ReloadSearchForm('$sSearchFormId', this.value, '$sRootClass', '$sContext')\">\n".implode('',
+			$sClassesCombo = "<select name=\"class\" onChange=\"ReloadSearchForm('$sSearchFormId', this.value, '$sRootClass', '$sContext', '{$aExtraParams['table_id']}')\">\n".implode('',
 					$aOptions)."</select>\n";
 		}
 		else
@@ -119,8 +119,8 @@ class SearchForm
 		$sHtml .= "<form id=\"fs_{$sSearchFormId}\" action=\"{$sAction}\" class=\"{$sStyle}\">\n"; // Don't use $_SERVER['SCRIPT_NAME'] since the form may be called asynchronously (from ajax.php)
 		$sHtml .= "<h2 class=\"sf_title\"><span class=\"sft_picto fa fa-search\"></span>" . Dict::Format('UI:SearchFor_Class_Objects', $sClassesCombo) . "<a class=\"sft_toggler fa fa-caret-down pull-right\" href=\"#\" title=\"" . Dict::S('UI:Search:Toggle') . "\"></a><a class=\"sft_refresh fa fa-refresh pull-right\" href=\"#\" title=\"" . Dict::S('UI:Button:Refresh') . "\"></a></h2>\n";
 		$sHtml .= "<div id=\"fs_{$sSearchFormId}_message\" class=\"sf_message header_message\"></div>\n";
-		$sHtml .= "<div id=\"fs_{$sSearchFormId}_criterion_outer\">\n";
-		$sHtml .= "</div>\n</form>\n";
+		$sHtml .= "<div id=\"fs_{$sSearchFormId}_criterion_outer\">\n</div>\n";
+		$sHtml .= "</form>\n";
 
 		$aFields = $this->GetFields($oSet);
 		$oSearch = $oSet->GetFilter();
@@ -145,7 +145,7 @@ class SearchForm
 		}
 		if (!array_key_exists('table_inner_id', $aExtraParams))
 		{
-			$aListParams['table_inner_id'] = uniqid('table_inner_id_');
+			$aListParams['table_inner_id'] = "table_inner_id_{$sSearchFormId}";
 		}
 		// When table_id is different of result_list_outer_selector
 		if (array_key_exists('table_id2', $aExtraParams))