From 2afc6d1c629baa262253df2e79cf6d435ff8785b Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Mon, 11 Jun 2018 07:55:40 +0000
Subject: [PATCH] =?UTF-8?q?N=C2=B01453=20Portal:=20Fix=20ajax=20filter=20o?=
 =?UTF-8?q?n=20ManageBrick=20that=20was=20looking=20on=20"standard=5Fsearc?=
 =?UTF-8?q?h"=20zlist=20attributes=20instead=20of=20the=20brick=20fields.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

SVN:trunk[5849]
---
 .../controllers/managebrickcontroller.class.inc.php   | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php
index 1f527112f1..792768d688 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php
@@ -64,9 +64,8 @@ class ManageBrickController extends BrickController
 	 * @throws \MySQLException
 	 * @throws \OQLException
 	 */
-	public function DisplayAction(
-		Request $oRequest, Application $oApp, $sBrickId, $sGroupingTab, $sDisplayType = null, $sDataLoading = null
-	) {
+	public function DisplayAction(Request $oRequest, Application $oApp, $sBrickId, $sGroupingTab, $sDisplayType = null, $sDataLoading = null)
+    {
 		/** @var ManageBrick $oBrick */
 		$oBrick = ApplicationHelper::GetLoadedBrickFromId($oApp, $sBrickId);
 
@@ -280,7 +279,7 @@ class ManageBrickController extends BrickController
 		$sIconURL = \MetaModel::GetClassIcon($sClass, false);
 
 		// - Adding search clause if necessary
-		$this->ManageSearchValue($oRequest, $aData, $oQuery, $sClass);
+		$this->ManageSearchValue($oRequest, $aData, $oQuery, $sClass, $aColumnsAttrs);
 
 		// Preparing tabs
 		// - We need to retrieve distinct values for the grouping attribute
@@ -742,7 +741,7 @@ class ManageBrickController extends BrickController
 	 * @param DBSearch $oQuery
 	 * @param string $sClass
 	 */
-	protected function ManageSearchValue(Request $oRequest, &$aData, DBSearch &$oQuery, $sClass)
+	protected function ManageSearchValue(Request $oRequest, &$aData, DBSearch &$oQuery, $sClass, $aColumnsAttrs)
 	{
 		// Getting search value
 		$sSearchValue = $oRequest->get('sSearchValue', null);
@@ -751,7 +750,7 @@ class ManageBrickController extends BrickController
 		// Note : This is a very naive search at the moment
 		if ($sSearchValue !== null)
 		{
-			$aSearchListItems = MetaModel::GetZListItems($sClass, 'list');
+		    $aSearchListItems = $aColumnsAttrs;
 			$oFullBinExpr = null;
 			foreach ($aSearchListItems as $sSearchItemAttr)
 			{