From 891dd3129083a7c88382d55f451033d0cd56308b Mon Sep 17 00:00:00 2001
From: Timmy38 <101416770+Timmy38@users.noreply.github.com>
Date: Tue, 10 May 2022 17:36:56 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B05072=20-=20Fix=20default=20priority=20to?=
 =?UTF-8?q?=20undefined=20(null)=20or=20default=20value=20if=20not=20nulla?=
 =?UTF-8?q?ble=20(#279)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix default priority to undefined

* Default priority : if null value not allowed, use default value for priority

* Default priority : moving code from ComputeValues() to ComputePriority()

* Default priority : re-indenting code
---
 .../datamodel.itop-incident-mgmt-itil.xml     | 67 +++++++++---------
 .../datamodel.itop-problem-mgmt.xml           | 69 ++++++++++---------
 .../datamodel.itop-request-mgmt-itil.xml      | 67 +++++++++---------
 .../datamodel.itop-request-mgmt.xml           | 67 +++++++++---------
 4 files changed, 137 insertions(+), 133 deletions(-)

diff --git a/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml b/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml
index b2c5c4fc5..c21c03349 100755
--- a/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml
+++ b/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml
@@ -1142,39 +1142,40 @@
 					<static>false</static>
 					<access>public</access>
 					<type>LifecycleAction</type>
-					<code><![CDATA[        public function ComputePriority()
-        {
-                // priority[impact][urgency]
-                $aPriorities = array(
-                        // single person
-                        1 => array(
-                                        1 => 1,
-                                        2 => 1,
-                                        3 => 2,
-                                        4 => 4,
-                        ),
-                        // a group
-                        2 => array(
-                                1 => 1,
-                                2 => 2,
-                                3 => 3,
-                                4 => 4,
-                        ),
-                        // a departement!
-                        3 => array(
-                                        1 => 2,
-                                        2 => 3,
-                                        3 => 3,
-                                        4 => 4,
-                        ),
-                );
-                $iPriority = 1;
-                if (isset($aPriorities[(int)$this->Get('impact')]) && isset($aPriorities[(int)$this->Get('impact')][(int)$this->Get('urgency')]))
-                {
-                        $iPriority = $aPriorities[(int)$this->Get('impact')][(int)$this->Get('urgency')];
-                }
-                return $iPriority;              
-        }]]></code>
+					<code><![CDATA[public function ComputePriority()
+	{
+		// priority[impact][urgency]
+		$aPriorities = array(
+			// single person
+			1 => array(
+				1 => 1,
+				2 => 1,
+				3 => 2,
+				4 => 4,
+			),
+			// a group
+			2 => array(
+				1 => 1,
+				2 => 2,
+				3 => 3,
+				4 => 4,
+			),
+			// a departement!
+			3 => array(
+				1 => 2,
+				2 => 3,
+				3 => 3,
+				4 => 4,
+			),
+		);
+		$oAttDef = MetaModel::GetAttributeDef(get_class($this), 'priority');
+		$iPriority = $oAttDef->IsNullAllowed() ? null : $oAttDef->GetDefaultValue();
+
+		if (isset($aPriorities[(int)$this->Get('impact')]) && isset($aPriorities[(int)$this->Get('impact')][(int)$this->Get('urgency')])) {
+			$iPriority = $aPriorities[(int)$this->Get('impact')][(int)$this->Get('urgency')];
+		}
+		return $iPriority;
+	}]]></code>
 				</method>
 				<method id="ComputeValues">
 					<static>false</static>
diff --git a/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml b/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml
index decd0acaf..7ee74c6f8 100755
--- a/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml
+++ b/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml
@@ -172,7 +172,7 @@
                         </value>
                     </values>
                     <sql>priority</sql>
-                    <default_value>1</default_value>
+                    <default_value>4</default_value>
                     <is_null_allowed>false</is_null_allowed>
                     <display_style>list</display_style>
                     <dependencies>
@@ -485,39 +485,40 @@
                     <static>false</static>
                     <access>public</access>
                     <type>LifecycleAction</type>
-                    <code><![CDATA[        public function ComputePriority()
-        {
-                // priority[impact][urgency]
-                $aPriorities = array(
-                        // single person
-                        1 => array(
-                                        1 => 1,
-                                        2 => 1,
-                                        3 => 2,
-                                        4 => 4,
-                        ),
-                        // a group
-                        2 => array(
-                                1 => 1,
-                                2 => 2,
-                                3 => 3,
-                                4 => 4,
-                        ),
-                        // a departement!
-                        3 => array(
-                                        1 => 2,
-                                        2 => 3,
-                                        3 => 3,
-                                        4 => 4,
-                        ),
-                );
-                $iPriority = 1;
-                if (isset($aPriorities[(int)$this->Get('impact')][(int)$this->Get('urgency')]))
-                {
-                        $iPriority = $aPriorities[(int)$this->Get('impact')][(int)$this->Get('urgency')];
-                }
-                return $iPriority;              
-        }]]></code>
+                    <code><![CDATA[public function ComputePriority()
+	{
+		// priority[impact][urgency]
+		$aPriorities = array(
+			// single person
+			1 => array(
+				1 => 1,
+				2 => 1,
+				3 => 2,
+				4 => 4,
+			),
+			// a group
+			2 => array(
+				1 => 1,
+				2 => 2,
+				3 => 3,
+				4 => 4,
+			),
+			// a departement!
+			3 => array(
+				1 => 2,
+				2 => 3,
+				3 => 3,
+				4 => 4,
+			),
+		);
+		$oAttDef = MetaModel::GetAttributeDef(get_class($this), 'priority');
+		$iPriority = $oAttDef->IsNullAllowed() ? null : $oAttDef->GetDefaultValue();
+
+		if (isset($aPriorities[(int)$this->Get('impact')]) && isset($aPriorities[(int)$this->Get('impact')][(int)$this->Get('urgency')])) {
+			$iPriority = $aPriorities[(int)$this->Get('impact')][(int)$this->Get('urgency')];
+		}
+		return $iPriority;
+	}]]></code>
                 </method>
                 <method id="ComputeValues">
                     <static>false</static>
diff --git a/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml b/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml
index 15d42243d..b860a3ef4 100755
--- a/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml
+++ b/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml
@@ -1302,39 +1302,40 @@
 					<static>false</static>
 					<access>public</access>
 					<type>LifecycleAction</type>
-					<code><![CDATA[        public function ComputePriority()
-        {
-                // priority[impact][urgency]
-                $aPriorities = array(
-                        // a department
-                        1 => array(
-                                        1 => 1,
-                                        2 => 1,
-                                        3 => 2,
-                                        4 => 4,
-                        ),
-                        // a group
-                        2 => array(
-                                1 => 1,
-                                2 => 2,
-                                3 => 3,
-                                4 => 4,
-                        ),
-                        // a person
-                        3 => array(
-                                        1 => 2,
-                                        2 => 3,
-                                        3 => 3,
-                                        4 => 4,
-                        ),
-                );
-                $iPriority = 1;
-                if (isset($aPriorities[(int)$this->Get('impact')]) && isset($aPriorities[(int)$this->Get('impact')][(int)$this->Get('urgency')]))
-                {
-                        $iPriority = $aPriorities[(int)$this->Get('impact')][(int)$this->Get('urgency')];
-                }
-                return $iPriority;              
-        }]]></code>
+					<code><![CDATA[public function ComputePriority()
+	{
+		// priority[impact][urgency]
+		$aPriorities = array(
+			// a department
+			1 => array(
+				1 => 1,
+				2 => 1,
+				3 => 2,
+				4 => 4,
+			),
+			// a group
+			2 => array(
+				1 => 1,
+				2 => 2,
+				3 => 3,
+				4 => 4,
+			),
+			// a person
+			3 => array(
+				1 => 2,
+				2 => 3,
+				3 => 3,
+				4 => 4,
+			),
+		);
+		$oAttDef = MetaModel::GetAttributeDef(get_class($this), 'priority');
+		$iPriority = $oAttDef->IsNullAllowed() ? null : $oAttDef->GetDefaultValue();
+
+		if (isset($aPriorities[(int)$this->Get('impact')]) && isset($aPriorities[(int)$this->Get('impact')][(int)$this->Get('urgency')])) {
+			$iPriority = $aPriorities[(int)$this->Get('impact')][(int)$this->Get('urgency')];
+		}
+		return $iPriority;
+	}]]></code>
 				</method>
 				<method id="ComputeValues">
 					<static>false</static>
diff --git a/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml b/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml
index e373bc218..fef4e827b 100755
--- a/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml
+++ b/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml
@@ -1336,39 +1336,40 @@
                     <static>false</static>
                     <access>public</access>
                     <type>LifecycleAction</type>
-                    <code><![CDATA[        public function ComputePriority()
-        {
-                // priority[impact][urgency]
-                $aPriorities = array(
-                        // a department
-                        1 => array(
-                                        1 => 1,
-                                        2 => 1,
-                                        3 => 2,
-                                        4 => 4,
-                        ),
-                        // a group
-                        2 => array(
-                                1 => 1,
-                                2 => 2,
-                                3 => 3,
-                                4 => 4,
-                        ),
-                        // a person
-                        3 => array(
-                                        1 => 2,
-                                        2 => 3,
-                                        3 => 3,
-                                        4 => 4,
-                        ),
-                );
-                $iPriority = 1;
-                if (isset($aPriorities[(int)$this->Get('impact')]) && isset($aPriorities[(int)$this->Get('impact')][(int)$this->Get('urgency')]))
-                {
-                        $iPriority = $aPriorities[(int)$this->Get('impact')][(int)$this->Get('urgency')];
-                }
-                return $iPriority;              
-        }]]></code>
+                    <code><![CDATA[public function ComputePriority()
+	{
+		// priority[impact][urgency]
+		$aPriorities = array(
+			// a department
+			1 => array(
+				1 => 1,
+				2 => 1,
+				3 => 2,
+				4 => 4,
+			),
+			// a group
+			2 => array(
+				1 => 1,
+				2 => 2,
+				3 => 3,
+				4 => 4,
+			),
+			// a person
+			3 => array(
+				1 => 2,
+				2 => 3,
+				3 => 3,
+				4 => 4,
+			),
+		);
+		$oAttDef = MetaModel::GetAttributeDef(get_class($this), 'priority');
+		$iPriority = $oAttDef->IsNullAllowed() ? null : $oAttDef->GetDefaultValue();
+
+		if (isset($aPriorities[(int)$this->Get('impact')]) && isset($aPriorities[(int)$this->Get('impact')][(int)$this->Get('urgency')])) {
+			$iPriority = $aPriorities[(int)$this->Get('impact')][(int)$this->Get('urgency')];
+		}
+		return $iPriority;
+	}]]></code>
                 </method>
                 <method id="ComputeValues">
                     <static>false</static>