From 31a34c247c51cbdb0bda776c4830575891bef110 Mon Sep 17 00:00:00 2001
From: Stephen Abello <stephen.abello@combodo.com>
Date: Fri, 13 Sep 2019 10:42:55 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B02482=20Regression=20on=20mandatory=20ext?=
 =?UTF-8?q?ernal=20field=20with=20only=201=20value?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/cmdbabstract.class.inc.php    | 9 ++++++---
 application/ui.extkeywidget.class.inc.php | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php
index da0d735aa3..bc0fcbb4f4 100644
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
@@ -2178,11 +2178,14 @@ EOF
 									if ((count($aAllowedValues) == 1) && ($bMandatory == 'true'))
 									{
 										// When there is only once choice, select it by default
-										$oPage->add_ready_script(
-											<<<EOF
+										if($value != $key)
+										{
+											$oPage->add_ready_script(
+												<<<EOF
 $('#$iId').attr('data-validate','dependencies');
 EOF
-										);
+											);
+										}
 										$sSelected = ' selected';
 									}
 									else
diff --git a/application/ui.extkeywidget.class.inc.php b/application/ui.extkeywidget.class.inc.php
index fc722ac556..b371d62043 100644
--- a/application/ui.extkeywidget.class.inc.php
+++ b/application/ui.extkeywidget.class.inc.php
@@ -208,11 +208,14 @@ class UIExtKeyWidget
 					{
 						// When there is only once choice, select it by default
 						$sSelected = 'selected';
-						$oPage->add_ready_script(
-							<<<EOF
+						if($value != $key)
+						{
+							$oPage->add_ready_script(
+								<<<EOF
 $('#$this->iId').attr('data-validate','dependencies');
 EOF
-						);
+							);
+						}
 					}
 					else
 					{