From 09aef4ef39420c6e0d043c5995dd2484c5b85329 Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Tue, 23 Aug 2016 12:44:38 +0000
Subject: [PATCH] (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.

SVN:2.3[4339]
---
 .../src/views/bricks/manage/layout.html.twig  | 39 ++++++++++++-------
 .../itop-tickets/datamodel.itop-tickets.xml   | 18 +++++++--
 2 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/datamodels/2.x/itop-portal-base/portal/src/views/bricks/manage/layout.html.twig b/datamodels/2.x/itop-portal-base/portal/src/views/bricks/manage/layout.html.twig
index 22cce2bf73..8b89635e5f 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/views/bricks/manage/layout.html.twig
+++ b/datamodels/2.x/itop-portal-base/portal/src/views/bricks/manage/layout.html.twig
@@ -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>
diff --git a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
index f8effe7431..2ca2637724 100755
--- a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
+++ b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
@@ -1130,9 +1130,9 @@
 					</fields>
 					<!-- Optional tag to add attributes to the table by their code -->
 					<grouping>
-						<!-- Optionnal -->
+						<!-- Mandatory -->
 						<tabs>
-							<!-- Optionnal. Grouping by tabs -->
+							<!-- Mandatory. Grouping by tabs -->
 							<!--<attribute>operational_status</attribute>-->
 							<!-- attribute xor groups tag -->
 							<groups>
@@ -1169,7 +1169,7 @@
 					<decoration_class>
 						<default>fc fc-closed-request fc-2x</default>
 					</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 -->
 					<!-- <class>Ticket</class> -->
 					<fields>
@@ -1181,6 +1181,18 @@
 						<field id="priority"/>
 						<field id="caller_id"/>
 					</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>
 				</brick>
 			</bricks>