From 432a56522142e9ce8c3bc5203dcfcbda04998028 Mon Sep 17 00:00:00 2001
From: acognet <anne-catherine.cognet@combodo.com>
Date: Fri, 28 Aug 2020 12:09:41 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B02508=20-=20Include=20Obsolescence=20icon?=
 =?UTF-8?q?=20within=20list=20and=20autocomplete?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/search/search_form_criteria_enum.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/js/search/search_form_criteria_enum.js b/js/search/search_form_criteria_enum.js
index be741ca25c..1b40d62d9f 100644
--- a/js/search/search_form_criteria_enum.js
+++ b/js/search/search_form_criteria_enum.js
@@ -695,7 +695,7 @@ $(function()
 					var bSelected = (this.element.find(this._getSelectedValuesWrapperSelector() + ' .sfc_opc_mc_item[data-value-code="' + sValue + '"]').length > 0);
 					var bInitChecked = bSelected;
 					var bInitHidden = bSelected;
-					var oValueElem = this._makeListItemElement(sLabel, sValue, bInitChecked, bInitHidden);
+					var oValueElem = this._makeListItemElement(sLabel, sValue, bInitChecked, bInitHidden,oResponse[skey].obsolescence_flag,oResponse[skey].additional_field);
 					oValueElem.appendTo(oDynamicListElem);
 				}
 			}
@@ -719,11 +719,12 @@ $(function()
                 {
                     var sValue = oResponse[skey].value;
                     var sLabel = oResponse[skey].label;
+
                     // Note: We don't use the _isSelectedValue() method here as it only returns "applied" values; at this moment will could have a checked value that is not among selected (me.options.values) yet. The result would be an hidden item from the AC results.
                     var bSelected = (this.element.find(this._getSelectedValuesWrapperSelector() + ' .sfc_opc_mc_item[data-value-code="' + sValue + '"]').length > 0);
                     var bInitChecked = bSelected;
                     var bInitHidden = bSelected;
-                    var oValueElem = this._makeListItemElement(sLabel, sValue, bInitChecked, bInitHidden);
+                    var oValueElem = this._makeListItemElement(sLabel, sValue, bInitChecked, bInitHidden,oResponse[skey].obsolescence_flag,oResponse[skey].additional_field);
                     oValueElem.appendTo(oDynamicListElem);
                 }
             }
@@ -914,9 +915,17 @@ $(function()
 			return aSortable;
 		},
 		// - Make a jQuery element for a list item
-		_makeListItemElement: function(sLabel, sValue, bInitChecked, bInitHidden)
+		_makeListItemElement: function(sLabel, sValue, bInitChecked, bInitHidden,bObsolete, sAdditionalField)
 		{
 			var sEscapedLabel = sLabel; // Note: We don't escape this anymore as there is an issue with AttributeExternalKey being already escaped. This will be put back in iTop 2.7 with the AttributeDefinition::GetAllowedValues() refactoring. $('<div />').text(sLabel).html();
+			if (bObsolete == 1)	{
+				sEscapedLabel = '<span class="object-ref-icon fas fa-eye-slash object-obsolete fa-1x fa-fw"></span>'+sEscapedLabel;
+			}
+
+			if (sAdditionalField != undefined )	{
+				sEscapedLabel = sEscapedLabel+'<br><i>'+sAdditionalField+'</i>';
+			}
+
 			var oItemElem = $('<div></div>')
 				.addClass('sfc_opc_mc_item')
 				.attr('data-value-code', sValue)