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

N°2432 Portal: Manage and Browse brick filters now apply on subclasses fields in lazy mode

Browse Source
This commit is contained in:
Stephen Abello
2019-08-09 10:44:38 +02:00
parent 4d78b7ca13
commit 543e57ed7d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
datamodels/2.x/itop-portal-base/portal/src/Controller/ManageBrickController.php
View File

@@ -405,9 +405,6 @@ class ManageBrickController extends BrickController
// Retrieve the current tab description to set the page subtitle (if it exists) // Retrieve the current tab description to set the page subtitle (if it exists)
$aData['sBrickSubtitle'] = !empty($aGroupingTabsValues[$sGroupingTab]['description']) ? $aGroupingTabsValues[$sGroupingTab]['description'] : null; $aData['sBrickSubtitle'] = !empty($aGroupingTabsValues[$sGroupingTab]['description']) ? $aGroupingTabsValues[$sGroupingTab]['description'] : null;
// - Adding search clause if necessary
$this->ManageSearchValue($aData, $oQuery, $sClass, $aColumnsAttrs);
// - Transforming search sort params to OQL format // - Transforming search sort params to OQL format
$aSortedParams = $oBrickControllerHelper->ExtractSortParams(); $aSortedParams = $oBrickControllerHelper->ExtractSortParams();
@@ -509,6 +506,9 @@ class ManageBrickController extends BrickController
// Checking if we have a valid query // Checking if we have a valid query
if ($oQuery !== null) if ($oQuery !== null)
{ {
// - Adding search clause if necessary
$this->ManageSearchValue($aData, $oQuery, $sKey, $aColumnsAttrs);
// Setting query pagination if needed // Setting query pagination if needed
if ($sDataLoading === AbstractBrick::ENUM_DATA_LOADING_LAZY) if ($sDataLoading === AbstractBrick::ENUM_DATA_LOADING_LAZY)
{ {