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

(Retrofit from trunk) 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:2.3[4339]
This commit is contained in:
Guillaume Lajarige
2016-08-23 12:44:38 +00:00
parent 950c868230
commit 09aef4ef39
2 changed files with 40 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

18
datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
View File

@@ -1130,9 +1130,9 @@
</fields> </fields>
<!-- Optional tag to add attributes to the table by their code --> <!-- Optional tag to add attributes to the table by their code -->
<grouping> <grouping>
<!-- Optionnal --> <!-- Mandatory -->
<tabs> <tabs>
<!-- Optionnal. Grouping by tabs --> <!-- Mandatory. Grouping by tabs -->
<!--<attribute>operational_status</attribute>--> <!--<attribute>operational_status</attribute>-->
<!-- attribute xor groups tag --> <!-- attribute xor groups tag -->
<groups> <groups>
@@ -1169,7 +1169,7 @@
<decoration_class> <decoration_class>
<default>fc fc-closed-request fc-2x</default> <default>fc fc-closed-request fc-2x</default>
</decoration_class> </decoration_class>
<oql><![CDATA[SELECT UserRequest WHERE org_id = :current_contact->org_id AND caller_id = :current_contact_id AND status = 'closed']]></oql> <oql><![CDATA[SELECT Ticket WHERE org_id = :current_contact->org_id AND caller_id = :current_contact_id AND operational_status = 'closed']]></oql>
<!-- Can be either a class tag with the class name or an oql tag with the query --> <!-- Can be either a class tag with the class name or an oql tag with the query -->
<!-- <class>Ticket</class> --> <!-- <class>Ticket</class> -->
<fields> <fields>
@@ -1181,6 +1181,18 @@
<field id="priority"/> <field id="priority"/>
<field id="caller_id"/> <field id="caller_id"/>
</fields> </fields>
<grouping>
<tabs>
<groups>
<group id="all">
<rank>1</rank>
<title>Brick:Portal:ClosedRequests:Title</title>
<condition><![CDATA[SELECT Ticket]]></condition>
</group>
</groups>
</tabs>
<!-- Implicit grouping on y axis by finalclass -->
</grouping>
<data_loading>auto</data_loading> <data_loading>auto</data_loading>
</brick> </brick>
</bricks> </bricks>