composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 23:32:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°2508 - Include Obsolescence icon within list and autocomplete

Browse Source
This commit is contained in:
acognet
2020-08-28 12:09:41 +02:00
parent 7d8aaf91db
commit 432a565221
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
js/search/search_form_criteria_enum.js
View File

@@ -695,7 +695,7 @@ $(function()
var bSelected = (this.element.find(this._getSelectedValuesWrapperSelector() + ' .sfc_opc_mc_item[data-value-code="' + sValue + '"]').length > 0); var bSelected = (this.element.find(this._getSelectedValuesWrapperSelector() + ' .sfc_opc_mc_item[data-value-code="' + sValue + '"]').length > 0);
var bInitChecked = bSelected; var bInitChecked = bSelected;
var bInitHidden = 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); oValueElem.appendTo(oDynamicListElem);
} }
} }
@@ -719,11 +719,12 @@ $(function()
{ {
var sValue = oResponse[skey].value; var sValue = oResponse[skey].value;
var sLabel = oResponse[skey].label; 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. // 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 bSelected = (this.element.find(this._getSelectedValuesWrapperSelector() + ' .sfc_opc_mc_item[data-value-code="' + sValue + '"]').length > 0);
var bInitChecked = bSelected; var bInitChecked = bSelected;
var bInitHidden = 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); oValueElem.appendTo(oDynamicListElem);
} }
} }
@@ -914,9 +915,17 @@ $(function()
return aSortable; return aSortable;
}, },
// - Make a jQuery element for a list item // - 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(); 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>') var oItemElem = $('<div></div>')
.addClass('sfc_opc_mc_item') .addClass('sfc_opc_mc_item')
.attr('data-value-code', sValue) .attr('data-value-code', sValue)