composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Advanced search: Fixes for autocomplete on external keys.

Browse Source 
SVN:trunk[5674]
This commit is contained in:
Guillaume Lajarige
2018-04-16 15:44:39 +00:00
parent eddf4226b7
commit bd8e44f835
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
js/search/search_form_criteria_enum.js
View File

@@ -482,18 +482,19 @@ $(function()
}
// Uncheck all allowed values
oOpElem.find('.sfc_opc_mc_item input').prop('checked', false);
oOpElem.find('.sfc_opc_mc_item').show();
oOpElem.find('.sfc_opc_mc_item input').prop('checked', false);
// Re-check allowed values from param
for(var iIdx in aValues)
{
var oItemElem = oOpElem.find('.sfc_opc_mc_item[data-value-code="' + aValues[iIdx].value + '"]');
var oItemElem = oOpElem.find(this._getAllowedValuesWrapperSelector()).find('.sfc_opc_mc_item[data-value-code="' + aValues[iIdx].value + '"]');
// Add value to dynamic items if not existing (undefined should have already been put in static items)
if(oItemElem.length == 0)
{
oItemElem = this._makeListItemElement(aValues[iIdx].label, aValues[iIdx].value, true);
oItemElem.appendTo(this.element.find(this._getDynamicValuesWrapperSelector()));
oItemElem.appendTo(oOpElem.find(this._getDynamicValuesWrapperSelector()));
}
// Check item
@@ -503,8 +504,16 @@ $(function()
// In case of autocomplete, clone item into selected items
if(this._hasAutocompleteAllowedValues() === true)
{
oSelectedItemElem = oItemElem.clone();
oSelectedItemElem.appendTo(this.element.find(this._getSelectedValuesWrapperSelector()));
var oSelectedItemElem = oOpElem.find(this._getSelectedValuesWrapperSelector()).find('.sfc_opc_mc_item[data-value-code="' + aValues[iIdx].value + '"]');
if(oSelectedItemElem.length == 0)
{
oSelectedItemElem = oItemElem.clone();
oSelectedItemElem.appendTo(oOpElem.find(this._getSelectedValuesWrapperSelector()));
}
oSelectedItemElem.show()
.find('input')
.prop('checked', true);
oItemElem.hide();
}
}
@@ -585,7 +594,12 @@ $(function()
// Value helpers
// - Return the selector for the element containing the dynamic values values
// - Return the selector for the element containing the static and dynamic values
_getAllowedValuesWrapperSelector: function()
{
return '.sfc_opc_mc_items_static, .sfc_opc_mc_items_dynamic';
},
// - Return the selector for the element containing the dynamic values
_getDynamicValuesWrapperSelector: function()
{
return '.sfc_opc_mc_items_dynamic';