From 7281bd4a1a82466d5543c971e73ebe81666897b0 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Fri, 5 Oct 2018 15:10:25 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B0931=20default=20datamodel=20:=20remove?=
 =?UTF-8?q?=20Ticket.tagfield=20and=20add=20AttributeTagSet=20FAQ.domains?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data.sample.faq-domains.xml               | 23 +++++++++++++++++++
 .../datamodel.itop-knownerror-mgmt.xml        | 17 ++++++++++----
 .../module.itop-knownerror-mgmt.php           |  2 +-
 .../itop-tickets/datamodel.itop-tickets.xml   |  9 --------
 4 files changed, 37 insertions(+), 14 deletions(-)
 create mode 100644 datamodels/2.x/itop-knownerror-mgmt/data.sample.faq-domains.xml

diff --git a/datamodels/2.x/itop-knownerror-mgmt/data.sample.faq-domains.xml b/datamodels/2.x/itop-knownerror-mgmt/data.sample.faq-domains.xml
new file mode 100644
index 000000000..880c33c2e
--- /dev/null
+++ b/datamodels/2.x/itop-knownerror-mgmt/data.sample.faq-domains.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Set>
+    <TagSetFieldDataFor_FAQ__domains id="1">
+        <code>software</code>
+        <label>Software 💾</label>
+    </TagSetFieldDataFor_FAQ__domains>
+    <TagSetFieldDataFor_FAQ__domains id="2">
+        <code>hardware</code>
+        <label>Hardware 💻</label>
+    </TagSetFieldDataFor_FAQ__domains>
+    <TagSetFieldDataFor_FAQ__domains id="3">
+        <code>server</code>
+        <label>Server 🏢</label>
+    </TagSetFieldDataFor_FAQ__domains>
+    <TagSetFieldDataFor_FAQ__domains id="4">
+        <code>mobile</code>
+        <label>Mobile 📱</label>
+    </TagSetFieldDataFor_FAQ__domains>
+    <TagSetFieldDataFor_FAQ__domains id="5">
+        <code>network</code>
+        <label>Network ☁️</label>
+    </TagSetFieldDataFor_FAQ__domains>
+</Set>
diff --git a/datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml b/datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml
index 692f62f5b..77169970a 100755
--- a/datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml
+++ b/datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml
@@ -444,6 +444,12 @@
           <default_value/>
           <is_null_allowed>true</is_null_allowed>
         </field>
+        <field id="domains" xsi:type="AttributeTagSet">
+          <sql>domains</sql>
+          <is_null_allowed>true</is_null_allowed>
+          <tracking_level>all</tracking_level>
+          <max_items>12</max_items>
+        </field>
       </fields>
       <methods/>
       <presentation>
@@ -461,12 +467,15 @@
             <item id="key_words">
               <rank>40</rank>
             </item>
-            <item id="summary">
+            <item id="domains">
               <rank>50</rank>
             </item>
-            <item id="description">
+            <item id="summary">
               <rank>60</rank>
             </item>
+            <item id="description">
+              <rank>70</rank>
+            </item>
           </items>
         </details>
         <search>
@@ -483,7 +492,7 @@
             <item id="error_code">
               <rank>40</rank>
             </item>
-            <item id="key_words">
+            <item id="domains">
               <rank>50</rank>
             </item>
           </items>
@@ -496,7 +505,7 @@
             <item id="error_code">
               <rank>20</rank>
             </item>
-            <item id="key_words">
+            <item id="domains">
               <rank>30</rank>
             </item>
           </items>
diff --git a/datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php
index 4096c93f7..13acc16e8 100755
--- a/datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php
@@ -29,7 +29,7 @@ SetupWebPage::AddModule(
 			//'data.struct.itop-knownerror-mgmt.xml',
 		),
 		'data.sample' => array(
-			//'data.sample.itop-knownerror-mgmt.xml',
+			'data.sample.faq-domains.xml',
 		),
 		
 		// Documentation
diff --git a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
index 89862b484..492c85861 100755
--- a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
+++ b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
@@ -196,12 +196,6 @@
 					<count_min>0</count_min>
 					<count_max>0</count_max>
 				</field>
-				<field id="tagfield" xsi:type="AttributeTagSet">
-					<sql>tagfield</sql>
-					<is_null_allowed>true</is_null_allowed>
-					<tracking_level>all</tracking_level>
-					<max_items>12</max_items>
-				</field>
 			</fields>
 			<methods>
 				<method id="DBInsertNoReload">
@@ -285,9 +279,6 @@
 						<item id="operational_status">
 							<rank>75</rank>
 						</item>
-						<item id="tagfield">
-							<rank>76</rank>
-						</item>
 						<item id="start_date">
 							<rank>80</rank>
 						</item>