From 86a7192f5add115fcc4c195f0ce11ead0291e366 Mon Sep 17 00:00:00 2001
From: Stephen Abello <stephen.abello@combodo.com>
Date: Wed, 12 Jun 2019 14:37:46 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B02160:=20Correctly=20initialize=20fields?=
 =?UTF-8?q?=20depending=20on=20a=20select=20field=20with=20only=201=20valu?=
 =?UTF-8?q?e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/cmdbabstract.class.inc.php    | 5 +++++
 application/ui.extkeywidget.class.inc.php | 5 +++++
 js/forms-json-utils.js                    | 1 +
 3 files changed, 11 insertions(+)

diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php
index 792632184..da0d735aa 100644
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
@@ -2178,6 +2178,11 @@ EOF
 									if ((count($aAllowedValues) == 1) && ($bMandatory == 'true'))
 									{
 										// When there is only once choice, select it by default
+										$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 12c33e347..fc722ac55 100644
--- a/application/ui.extkeywidget.class.inc.php
+++ b/application/ui.extkeywidget.class.inc.php
@@ -208,6 +208,11 @@ class UIExtKeyWidget
 					{
 						// When there is only once choice, select it by default
 						$sSelected = 'selected';
+						$oPage->add_ready_script(
+							<<<EOF
+$('#$this->iId').attr('data-validate','dependencies');
+EOF
+						);
 					}
 					else
 					{
diff --git a/js/forms-json-utils.js b/js/forms-json-utils.js
index 60ebf6416..29363419b 100644
--- a/js/forms-json-utils.js
+++ b/js/forms-json-utils.js
@@ -190,6 +190,7 @@ function ReportFieldValidationStatus(sFieldId, sFormId, bValid, sExplain)
 	{
 		// Visual feedback - none when it's Ok
 		$('#v_'+sFieldId).html(''); //<img src="../images/validation_ok.png" />');
+		$('#'+sFieldId+'[data-validate*="dependencies"]').trigger('change.dependencies').removeAttr('data-validate');
 	}
 	else
 	{