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

Advanced search: UX on enum widget.

Browse Source 
SVN:b1162[5497]
This commit is contained in:
Guillaume Lajarige
2018-03-22 18:15:56 +00:00
parent 254b3fe9aa
commit bbb4959f22
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
js/search/search_form_criteria_enum.js
View File

@@ -101,8 +101,11 @@ $(function()
// - Allowed values // - Allowed values
var oAllowedValuesElem = $('<div class="sfc_opc_mc_items"></div>'); var oAllowedValuesElem = $('<div class="sfc_opc_mc_items"></div>');
// - Null value is allowed
// TODO: We might want to move this into the allowed_values for a standard behavior. But that needs to know how to send the "null" value to the server. // - Null value if allowed
// Note: null values is NOT put among the allowed values for two reasons:
// - It must be the first value of the list
// - It is not give by neither the autocomplete or the pre-filled values, so we would need to manually add it in both cases, all operations.
if(this.options.field.is_null_allowed === true) if(this.options.field.is_null_allowed === true)
{ {
var sItemId = 'value_' + sOpId + '_null'; var sItemId = 'value_' + sOpId + '_null';
@@ -112,6 +115,7 @@ $(function()
.append('<label for="' + sItemId + '"><input type="checkbox" id="' + sItemId + '" value="' + sValCode + '"/>' + sValLabel + '</label>') .append('<label for="' + sItemId + '"><input type="checkbox" id="' + sItemId + '" value="' + sValCode + '"/>' + sValLabel + '</label>')
.appendTo(oAllowedValuesElem); .appendTo(oAllowedValuesElem);
} }
// - Regular allowed values // - Regular allowed values
if(this.options.field.allowed_values.values !== undefined) if(this.options.field.allowed_values.values !== undefined)
{ {
@@ -209,6 +213,14 @@ $(function()
var iValLimit = 3; var iValLimit = 3;
var iValCount = Object.keys(this.options.values).length; var iValCount = Object.keys(this.options.values).length;
var iAllowedValuesCount = (this.options.field.allowed_values.values !== undefined) ? Object.keys(this.options.field.allowed_values.values).length : 0; var iAllowedValuesCount = (this.options.field.allowed_values.values !== undefined) ? Object.keys(this.options.field.allowed_values.values).length : 0;
// Manually increase allowed values count if null is allowed
if(this.options.field.is_null_allowed === true)
{
iAllowedValuesCount++;
}
// Making right tite regarding the number of selected values
if( (iValCount === 0) || (iValCount === iAllowedValuesCount) ) if( (iValCount === 0) || (iValCount === iAllowedValuesCount) )
{ {
sTitle = Dict.Format('UI:Search:Criteria:Title:Enum:In:All', this.options.field.label); sTitle = Dict.Format('UI:Search:Criteria:Title:Enum:In:All', this.options.field.label);