From 51669d0479cc8fa7b420816050bb28b7eb81464d Mon Sep 17 00:00:00 2001
From: BenGrenoble <benjamin.planque@combodo.com>
Date: Wed, 7 Oct 2020 11:08:11 +0200
Subject: [PATCH] Fix datamodel Navigation rules and module parameters

---
 datamodels/2.x/itop-portal/datamodel.itop-portal.xml  | 11 +++++++++++
 .../2.x/itop-tickets/datamodel.itop-tickets.xml       |  9 ---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/datamodels/2.x/itop-portal/datamodel.itop-portal.xml b/datamodels/2.x/itop-portal/datamodel.itop-portal.xml
index 03b9329b38..9d26832f96 100644
--- a/datamodels/2.x/itop-portal/datamodel.itop-portal.xml
+++ b/datamodels/2.x/itop-portal/datamodel.itop-portal.xml
@@ -141,6 +141,17 @@
 			</form>
 		</brick>
 			</bricks>
+      <navigation_rules>
+        <!-- Close form (either the modal or the whole page) -->
+        <navigation_rule id="close-form" xsi:type="close" _delta="define"/>
+        <!-- Go to the homepage -->
+        <navigation_rule id="go-to-homepage" xsi:type="go-to-homepage" _delta="define"/>
+      </navigation_rules>
 		</module_design>
 	</module_designs>
+  <module_parameters>
+    <parameters id="itop-portal" _delta="define">
+      <lazy_loading_threshold>500</lazy_loading_threshold><!-- Will be placed in the conf/<env>/config-itop.php file under the itop-portal module's settings  -->
+    </parameters>
+  </module_parameters>
 </itop_design>
diff --git a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
index 04f299cbe4..c94f64f026 100755
--- a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
+++ b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
@@ -1275,10 +1275,6 @@
 				</action_rule>
 			</action_rules>
 			<navigation_rules>
-				<!-- Close form (either the modal or the whole page) -->
-				<navigation_rule id="close-form" xsi:type="close" _delta="define"/>
-				<!-- Go to the homepage -->
-				<navigation_rule id="go-to-homepage" xsi:type="go-to-homepage" _delta="define"/>
 				<!-- Open a manage brick (simple method) -->
 				<navigation_rule id="go-to-open-requests" xsi:type="go-to-manage-brick" _delta="define">
 					<!-- Mandatory, ID of the ManageBrick to go to -->
@@ -1313,9 +1309,4 @@
 			</navigation_rules>
 		</module_design>
 	</module_designs>
-	<module_parameters>
-		<parameters id="itop-portal" _delta="define">
-			<lazy_loading_threshold>500</lazy_loading_threshold><!-- Will be placed in the conf/<env>/config-itop.php file under the itop-portal module's settings  -->
-		</parameters>
-	</module_parameters>
 </itop_design>