From c1460cfdc7acabad1ef1cf0f872c9bca9df04aa6 Mon Sep 17 00:00:00 2001
From: Stephen Abello <stephen.abello@combodo.com>
Date: Wed, 9 Oct 2019 16:08:57 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B02142=20Portal:=20Fix=20list=20tabs=20and?=
 =?UTF-8?q?=20on=20charts=20click=20when=20a=20Manage=20brick=20has=20a=20?=
 =?UTF-8?q?chart=20as=20default=20display=20mode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../portal/src/Controller/ManageBrickController.php           | 4 ++--
 .../portal/templates/bricks/manage/layout-table.html.twig     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/datamodels/2.x/itop-portal-base/portal/src/Controller/ManageBrickController.php b/datamodels/2.x/itop-portal-base/portal/src/Controller/ManageBrickController.php
index 532a5afd6b..6bb4e599f0 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/Controller/ManageBrickController.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/Controller/ManageBrickController.php
@@ -784,9 +784,9 @@ class ManageBrickController extends BrickController
 						'label' => $aValues['label'],
 						'label_html' => $aValues['label_html'],
 					);
-					$aUrls[] = $oUrlGenerator->generate('p_manage_brick', array(
+					$aUrls[] = $oUrlGenerator->generate('p_manage_brick_display_as', array(
 						'sBrickId' => $sBrickId,
-						'sDisplayMode' => 'default',
+						'sDisplayMode' => 'list',
 						'sGroupingTab' => $aValues['value'],
 					));
 				}
diff --git a/datamodels/2.x/itop-portal-base/portal/templates/bricks/manage/layout-table.html.twig b/datamodels/2.x/itop-portal-base/portal/templates/bricks/manage/layout-table.html.twig
index 51d47e0964..b923001a30 100644
--- a/datamodels/2.x/itop-portal-base/portal/templates/bricks/manage/layout-table.html.twig
+++ b/datamodels/2.x/itop-portal-base/portal/templates/bricks/manage/layout-table.html.twig
@@ -9,7 +9,7 @@
         <ul class="nav nav-pills grouping_tabs">
             {% for aGroupingTab in aGroupingTabsValues %}
                 <li{% if sGroupingTab is defined and sGroupingTab == aGroupingTab.value %} class="active"{% endif %}>
-                    <a href="{{ app.url_generator.generate('p_manage_brick', {'sBrickId': sBrickId, 'sDisplayMode': 'default', 'sGroupingTab': aGroupingTab.value}) }}"
+                    <a href="{{ app.url_generator.generate('p_manage_brick_display_as', {'sBrickId': sBrickId, 'sDisplayMode': sDisplayMode, 'sGroupingTab': aGroupingTab.value}) }}"
                        id="btn_tab_for_{{ aGroupingTab.value }}">
                         {{ aGroupingTab.label|raw }}
                         {% if oBrick.GetShowTabCounts() %}