Skip to content
Snippets Groups Projects
Commit 72a83e06 authored by Prasad's avatar Prasad
Browse files

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

parents 55127e11 ad041da7
No related branches found
No related tags found
No related merge requests found
...@@ -217,6 +217,11 @@ jQuery.Class("Vtiger_AdvanceFilter_Js",{ ...@@ -217,6 +217,11 @@ jQuery.Class("Vtiger_AdvanceFilter_Js",{
var fieldSelected = fieldSelect.find('option:selected'); var fieldSelected = fieldSelect.find('option:selected');
var fieldSpecificType = this.getFieldSpecificType(fieldSelected) var fieldSpecificType = this.getFieldSpecificType(fieldSelected)
var conditionList = this.getConditionListFromType(fieldSpecificType); var conditionList = this.getConditionListFromType(fieldSpecificType);
var fieldInfo = fieldSelected.data('fieldinfo');
if(typeof fieldInfo != 'undefined') {
fieldType = fieldInfo.type;
}
//for none in field name //for none in field name
if(typeof conditionList == 'undefined') { if(typeof conditionList == 'undefined') {
conditionList = {}; conditionList = {};
...@@ -225,6 +230,8 @@ jQuery.Class("Vtiger_AdvanceFilter_Js",{ ...@@ -225,6 +230,8 @@ jQuery.Class("Vtiger_AdvanceFilter_Js",{
var options = ''; var options = '';
for(var key in conditionList) { 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. //IE Browser consider the prototype properties also, it should consider has own properties only.
if(conditionList.hasOwnProperty(key)) { if(conditionList.hasOwnProperty(key)) {
var conditionValue = conditionList[key]; var conditionValue = conditionList[key];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment