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

Advanced search: WIP POC, better criteria widget instanciation.

Browse Source 
SVN:b1162[5406]
This commit is contained in:
Guillaume Lajarige
2018-03-09 16:38:30 +00:00
parent b8aed0f004
commit 8cf4bc58a7
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
js/search/search_form_handler.js
View File

@@ -254,7 +254,8 @@ $(function()
if(sType !== null) if(sType !== null)
{ {
var sWidgetClass = 'search_form_criteria' + '_' + sType; // Retrieve widget class
var sWidgetName = this._getCriteriaWidgetNameFromType(sType);
// Add some informations from the field // Add some informations from the field
if(this._hasFieldDefinition(sRef)) if(this._hasFieldDefinition(sRef))
@@ -270,7 +271,7 @@ $(function()
.appendTo(this.elements.active_criterion); .appendTo(this.elements.active_criterion);
// Instanciate widget // Instanciate widget
$.itop[sWidgetClass](oData, oCriteriaElem); $.itop[sWidgetName](oData, oCriteriaElem);
} }
else else
{ {
@@ -300,6 +301,11 @@ $(function()
return sType; return sType;
}, },
// - Find a criteria's widget name from a criteria's type
_getCriteriaWidgetNameFromType: function(sType)
{
return 'search_form_criteria' + '_' + (($.itop['search_form_criteria_'+sType] !== undefined) ? sType : 'raw');
},
// Criteria handlers // Criteria handlers
_onCriteriaValueChanged: function(oData) _onCriteriaValueChanged: function(oData)
{ {
@@ -335,7 +341,7 @@ $(function()
'base_oql': this.options.search.base_oql, 'base_oql': this.options.search.base_oql,
'criterion': this.options.search.criterion, 'criterion': this.options.search.criterion,
}), }),
'list_params': this.options.list_params, 'list_params': JSON.stringify(this.options.list_params),
}; };
// Show loader // Show loader