From b1c48929e46ea27a67f68a91802557434beab67d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Tue, 3 Apr 2018 13:29:10 +0000
Subject: [PATCH] Advanced Search: Auto-complete search on foreign keys

SVN:b1162[5596]
---
 application/ui.searchformforeignkeys.class.inc.php | 6 ++----
 pages/ajax.render.php                              | 8 ++------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/application/ui.searchformforeignkeys.class.inc.php b/application/ui.searchformforeignkeys.class.inc.php
index 40fc04cac..1b97ac808 100644
--- a/application/ui.searchformforeignkeys.class.inc.php
+++ b/application/ui.searchformforeignkeys.class.inc.php
@@ -26,12 +26,10 @@ require_once(APPROOT.'/application/displayblock.class.inc.php');
 
 class UISearchFormForeignKeys
 {
-	public function __construct($sTargetClass, $iInputId = null, $sAttCode = null, $sSuffix = null)
+	public function __construct($sTargetClass, $iInputId = null)
 	{
 		$this->m_sRemoteClass = $sTargetClass;
 		$this->m_iInputId = $iInputId;
-		$this->m_sAttCode = $sAttCode;
-		$this->m_sNameSuffix = $sSuffix;
 	}
 
 	/**
@@ -57,7 +55,7 @@ class UISearchFormForeignKeys
 				'table_id' => "add_{$this->m_iInputId}",
 				'table_inner_id' => "ResultsToAdd_{$this->m_iInputId}",
 				'selection_mode' => true,
-				'cssCount' => '#count_'.$this->m_sAttCode.$this->m_sNameSuffix,
+				'cssCount' => "#count_{$this->m_iInputId}",
 				'query_params' => $oFilter->GetInternalParams(),
 			));
 		$sHtml .= "<form id=\"ObjectsAddForm_{$this->m_iInputId}\">\n";
diff --git a/pages/ajax.render.php b/pages/ajax.render.php
index 84d4c3d36..8f8b3fdd6 100644
--- a/pages/ajax.render.php
+++ b/pages/ajax.render.php
@@ -254,12 +254,10 @@ try
 		// ui.searchformforeignkeys
 		case 'ShowModalSearchForeignKeys':
 			$oPage->SetContentType('text/html');
-			$sAttCode = utils::ReadParam('sAttCode', '');
 			$iInputId = utils::ReadParam('iInputId', '');
-			$sSuffix = utils::ReadParam('sSuffix', '');
 			$sTitle = utils::ReadParam('sTitle', '', false, 'raw_data');
 			$sTargetClass = utils::ReadParam('sTargetClass', '', false, 'class');
-			$oWidget = new UISearchFormForeignKeys($sTargetClass, $iInputId, $sAttCode, $sSuffix);
+			$oWidget = new UISearchFormForeignKeys($sTargetClass, $iInputId);
 			$oWidget->ShowModalSearchForeignKeys($oPage, $sTitle);
 			break;
 
@@ -276,10 +274,8 @@ try
 			$oPage->SetContentType('text/html');
 			$sTargetClass = utils::ReadParam('sTargetClass', '', false, 'class');
 			$iInputId = utils::ReadParam('iInputId', '');
-			$sSuffix = utils::ReadParam('sSuffix', '');
-			$sAttCode = utils::ReadParam('sAttCode', '');
 			$sRemoteClass = utils::ReadParam('sRemoteClass', '', false, 'class');
-			$oWidget = new UISearchFormForeignKeys($sTargetClass, $iInputId, $sAttCode, $sSuffix);
+			$oWidget = new UISearchFormForeignKeys($sTargetClass, $iInputId);
 			$oWidget->ListResultsSearchForeignKeys($oPage, $sRemoteClass);
 			break;