composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-20 07:42:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°1453 Portal: Fix ajax filter on ManageBrick that was looking on "standard_search" zlist attributes instead of the brick fields.

Browse Source 
SVN:trunk[5849]
This commit is contained in:
Guillaume Lajarige
2018-06-11 07:55:40 +00:00
parent 708858da39
commit 2afc6d1c62
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php
View File

@@ -64,9 +64,8 @@ class ManageBrickController extends BrickController
* @throws \MySQLException * @throws \MySQLException
* @throws \OQLException * @throws \OQLException
*/ */
public function DisplayAction( public function DisplayAction(Request $oRequest, Application $oApp, $sBrickId, $sGroupingTab, $sDisplayType = null, $sDataLoading = null)
Request $oRequest, Application $oApp, $sBrickId, $sGroupingTab, $sDisplayType = null, $sDataLoading = null {
) {
/** @var ManageBrick $oBrick */ /** @var ManageBrick $oBrick */
$oBrick = ApplicationHelper::GetLoadedBrickFromId($oApp, $sBrickId); $oBrick = ApplicationHelper::GetLoadedBrickFromId($oApp, $sBrickId);
@@ -280,7 +279,7 @@ class ManageBrickController extends BrickController
$sIconURL = \MetaModel::GetClassIcon($sClass, false); $sIconURL = \MetaModel::GetClassIcon($sClass, false);
// - Adding search clause if necessary // - Adding search clause if necessary
$this->ManageSearchValue($oRequest, $aData, $oQuery, $sClass); $this->ManageSearchValue($oRequest, $aData, $oQuery, $sClass, $aColumnsAttrs);
// Preparing tabs // Preparing tabs
// - We need to retrieve distinct values for the grouping attribute // - We need to retrieve distinct values for the grouping attribute
@@ -742,7 +741,7 @@ class ManageBrickController extends BrickController
* @param DBSearch $oQuery * @param DBSearch $oQuery
* @param string $sClass * @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 // Getting search value
$sSearchValue = $oRequest->get('sSearchValue', null); $sSearchValue = $oRequest->get('sSearchValue', null);
@@ -751,7 +750,7 @@ class ManageBrickController extends BrickController
// Note : This is a very naive search at the moment // Note : This is a very naive search at the moment
if ($sSearchValue !== null) if ($sSearchValue !== null)
{ {
$aSearchListItems = MetaModel::GetZListItems($sClass, 'list'); $aSearchListItems = $aColumnsAttrs;
$oFullBinExpr = null; $oFullBinExpr = null;
foreach ($aSearchListItems as $sSearchItemAttr) foreach ($aSearchListItems as $sSearchItemAttr)
{ {