From 2803f0be4982beddf1bb307960f4f474cc5eb4b0 Mon Sep 17 00:00:00 2001
From: bdalsass <95754414+bdalsass@users.noreply.github.com>
Date: Fri, 10 Feb 2023 13:47:10 +0100
Subject: [PATCH] =?UTF-8?q?N=C2=B03190=20-=20Add=20iTop=20design=20format?=
=?UTF-8?q?=20compatibility=20converter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- Add converter for for display_style property
- Update php unit test to control conversion
---
setup/itopdesignformat.class.inc.php | 5 +++++
.../Convert-samples/3.1_to_3.0.expected.xml | 12 ++++++++++++
.../Convert-samples/3.1_to_3.0.input.xml | 14 ++++++++++++++
3 files changed, 31 insertions(+)
diff --git a/setup/itopdesignformat.class.inc.php b/setup/itopdesignformat.class.inc.php
index 2f5431519..9eeb4eb6d 100644
--- a/setup/itopdesignformat.class.inc.php
+++ b/setup/itopdesignformat.class.inc.php
@@ -1126,6 +1126,11 @@ class iTopDesignFormat
$this->RemoveNodeFromXPath('/itop_design/events');
$this->RemoveNodeFromXPath('/itop_design/event_listeners');
$this->RemoveNodeFromXPath('/itop_design/classes//class/event_listeners');
+
+ // N°3190 - Edit n:n LinkedSetIndirect in object details using a tagset-like widget
+ // - remove display style
+ $this->RemoveNodeFromXPath("/itop_design/classes//class/fields/field[@xsi:type='AttributeLinkedSet']/display_style");
+ $this->RemoveNodeFromXPath("/itop_design/classes//class/fields/field[@xsi:type='AttributeLinkedSetIndirect']/display_style");
}
/**
diff --git a/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.1_to_3.0.expected.xml b/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.1_to_3.0.expected.xml
index f85a68cc2..9a1d9376e 100644
--- a/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.1_to_3.0.expected.xml
+++ b/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.1_to_3.0.expected.xml
@@ -48,6 +48,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.1_to_3.0.input.xml b/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.1_to_3.0.input.xml
index 3be0991e7..8cae34fc4 100644
--- a/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.1_to_3.0.input.xml
+++ b/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.1_to_3.0.input.xml
@@ -62,6 +62,20 @@
+
+
+
+ tab
+
+
+
+
+
+
+ tab
+
+
+