Skip to content
Snippets Groups Projects

Fixes #1033 ::Uma:: Advance filter on combo box is addressed

Merged Uma requested to merge uma.s/vtigercrm:CustomFilter_MultiPicklist into master
+ 7
0
Compare changes
  • Side-by-side
  • Inline
@@ -217,6 +217,11 @@ jQuery.Class("Vtiger_AdvanceFilter_Js",{
var fieldSelected = fieldSelect.find('option:selected');
var fieldSpecificType = this.getFieldSpecificType(fieldSelected)
var conditionList = this.getConditionListFromType(fieldSpecificType);
var fieldInfo = fieldSelected.data('fieldinfo');
if(typeof fieldInfo != 'undefined') {
fieldType = fieldInfo.type;
}
//for none in field name
if(typeof conditionList == 'undefined') {
conditionList = {};
@@ -225,6 +230,8 @@ jQuery.Class("Vtiger_AdvanceFilter_Js",{
var options = '';
for(var key in conditionList) {
if (fieldType == 'multipicklist' && (conditionList[key] == "e" || conditionList[key] == "n" )) { continue; }
//IE Browser consider the prototype properties also, it should consider has own properties only.
if(conditionList.hasOwnProperty(key)) {
var conditionValue = conditionList[key];
Loading