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

N°2142 Portal: Fix list tabs and on charts click when a Manage brick has a chart as default display mode

Browse Source
This commit is contained in:
Stephen Abello
2019-10-09 16:08:57 +02:00
parent 85a94ee1e7
commit c1460cfdc7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -784,9 +784,9 @@ class ManageBrickController extends BrickController
'label' => $aValues['label'], 'label' => $aValues['label'],
'label_html' => $aValues['label_html'], 'label_html' => $aValues['label_html'],
); );
$aUrls[] = $oUrlGenerator->generate('p_manage_brick', array( $aUrls[] = $oUrlGenerator->generate('p_manage_brick_display_as', array(
'sBrickId' => $sBrickId, 'sBrickId' => $sBrickId,
'sDisplayMode' => 'default', 'sDisplayMode' => 'list',
'sGroupingTab' => $aValues['value'], 'sGroupingTab' => $aValues['value'],
)); ));
} }

2
datamodels/2.x/itop-portal-base/portal/templates/bricks/manage/layout-table.html.twig
View File

@@ -9,7 +9,7 @@
<ul class="nav nav-pills grouping_tabs"> <ul class="nav nav-pills grouping_tabs">
{% for aGroupingTab in aGroupingTabsValues %} {% for aGroupingTab in aGroupingTabsValues %}
<li{% if sGroupingTab is defined and sGroupingTab == aGroupingTab.value %} class="active"{% endif %}> <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 }}"> id="btn_tab_for_{{ aGroupingTab.value }}">
{{ aGroupingTab.label|raw }} {{ aGroupingTab.label|raw }}
{% if oBrick.GetShowTabCounts() %} {% if oBrick.GetShowTabCounts() %}