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

Portal : Fixed a bug on the default configuration that was displaying only UserRequest in the Closed requests brick instead of both UserRequest and Incident objects.

Browse Source 
SVN:trunk[4333]
This commit is contained in:
Guillaume Lajarige
2016-08-22 14:55:57 +00:00
parent 6d556249aa
commit 17703ce572
2 changed files with 40 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
datamodels/2.x/itop-portal-base/portal/src/views/bricks/manage/layout.html.twig
View File

@@ -17,24 +17,35 @@
{% endblock %}
{% block pMainContentHolder%}
{% set iTableCount = 0 %}
{% if aGroupingAreasData|length > 0 %}
{% for aAreaData in aGroupingAreasData %}
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">{{ aAreaData.sTitle }}</h3>
{% if aAreaData.iItemsCount > 0 %}
{% set iTableCount = iTableCount + 1 %}
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">{{ aAreaData.sTitle }}</h3>
</div>
<div class="panel-body">
{# We decided not to show empty tables anymore #}
{#
{% if aAreaData.iItemsCount > 0 %}
#}
<table id="table-{{ aAreaData.sId }}" class="table table-striped table-bordered responsive" width="100%"></table>
{#
{% else %}
<div class="text-center">
{{ 'Brick:Portal:Manage:Table:NoData'|dict_s }}
</div>
{% endif %}
#}
</div>
</div>
<div class="panel-body">
{% if aAreaData.iItemsCount > 0 %}
<table id="table-{{ aAreaData.sId }}" class="table table-striped table-bordered responsive" width="100%"></table>
{% else %}
<div class="text-center">
{{ 'Brick:Portal:Manage:Table:NoData'|dict_s }}
</div>
{% endif %}
</div>
</div>
{% endif %}
{% endfor %}
{% else %}
{% endif %}
{% if iTableCount == 0 %}
<div class="panel panel-default">
<div class="panel-body">
<h3 class="text-center">{{ 'Brick:Portal:Manage:Table:NoData'|dict_s }}</h3>