composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-22 10:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Portal: Fix regression in FilterBrick that crashes when pointing on a ManageBrick.

Browse Source 
SVN:trunk[5848]
This commit is contained in:
Guillaume Lajarige
2018-06-08 16:33:55 +00:00
parent 41dccb468e
commit 708858da39
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -751,7 +751,7 @@ class ManageBrickController extends BrickController
// Note : This is a very naive search at the moment
if ($sSearchValue !== null)
{
$aSearchListItems = MetaModel::GetZListItems($sClass, 'standard_search');
$aSearchListItems = MetaModel::GetZListItems($sClass, 'list');
$oFullBinExpr = null;
foreach ($aSearchListItems as $sSearchItemAttr)
{

10
datamodels/2.x/itop-portal-base/portal/src/routers/managebrickrouter.class.inc.php
View File

@@ -23,15 +23,15 @@ class ManageBrickRouter extends AbstractRouter
{
static $aRoutes = array(
array(
'pattern' => '/manage/{sBrickId}/{sDisplayType}/{sGroupingTab}',
'pattern' => '/manage/{sBrickId}/{sGroupingTab}/{sDisplayType}',
'callback' => 'Combodo\\iTop\\Portal\\Controller\\ManageBrickController::DisplayAction',
'bind' => 'p_manage_brick',
'asserts' => array(
'sDisplayType' => 'badge|pie-chart|bar-chart|top-list|default'
),
'values' => array(
'sDisplayType' => null, // will be set using brick's XML config
'sGroupingTab' => null
'sDisplayType' => 'default',
'sGroupingTab' => null,
)
),
array(
@@ -40,12 +40,12 @@ class ManageBrickRouter extends AbstractRouter
'bind' => 'p_manage_brick_lazy',
'asserts' => array(
'iPageNumber' => '\d+',
'iListLength' => '\d+'
'iListLength' => '\d+',
),
'values' => array(
'sDataLoading' => 'lazy',
'iPageNumber' => '1',
'iListLength' => '20'
'iListLength' => '20',
)
),
array(