From 796ac55ff441928d316db2290e4df520e38cb79b Mon Sep 17 00:00:00 2001 From: Guillaume Lajarige Date: Mon, 18 Sep 2017 15:43:19 +0000 Subject: [PATCH] =?UTF-8?q?(Retrofit=20from=20trunk)=20N=C2=B0762=20Portal?= =?UTF-8?q?:=20Pre-filtering=20a=20browse=20brick=20in=20tree=20mode=20was?= =?UTF-8?q?=20making=20tree=20collapsing=20instead=20of=20showing=20result?= =?UTF-8?q?s.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SVN:2.4[4916] --- .../portal/src/views/bricks/browse/mode_mosaic.html.twig | 1 + .../portal/src/views/bricks/browse/mode_tree.html.twig | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/mode_mosaic.html.twig b/datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/mode_mosaic.html.twig index e68095221f..728ef0fc42 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/mode_mosaic.html.twig +++ b/datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/mode_mosaic.html.twig @@ -408,6 +408,7 @@ registerFilterListeners(); // Open first level if only one item + // TODO: We must disable opening of first level when pre-filtering when filtering will be implemented if($('#brick_content_mosaic > .mosaic-group[data-level-id="L"] > .mosaic-group-item').length == 1) { setTimeout(function(){ diff --git a/datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/mode_tree.html.twig b/datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/mode_tree.html.twig index 7f7c8ce07a..5a95ef27d4 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/mode_tree.html.twig +++ b/datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/mode_tree.html.twig @@ -411,8 +411,8 @@ registerFilterListeners(); collapseAll(); - // Open first level if only one item - if($('#brick_content_tree > .list-group-item').length == 1) + // Open first level if only one item and not pre-filtering + if( ($('#brick_content_tree > .list-group-item').length == 1) && ($('#brick_search_field').val() === '') ) { setTimeout(function(){ $('#brick_content_tree > .list-group-item > .tree-toggle').trigger('click');