From b1962cfdaaaddd16f51702769f64a03c457b2dc5 Mon Sep 17 00:00:00 2001
From: Uma <uma.s@vtiger.com>
Date: Wed, 9 Oct 2019 10:54:40 +0530
Subject: [PATCH] Fixes #1033 ::Uma:: Advance filter on combo box is addressed
---
layouts/v7/modules/Vtiger/resources/AdvanceFilter.js | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/layouts/v7/modules/Vtiger/resources/AdvanceFilter.js b/layouts/v7/modules/Vtiger/resources/AdvanceFilter.js
index a2db141e5..093e905a1 100644
--- a/layouts/v7/modules/Vtiger/resources/AdvanceFilter.js
+++ b/layouts/v7/modules/Vtiger/resources/AdvanceFilter.js
@@ -217,6 +217,13 @@ jQuery.Class("Vtiger_AdvanceFilter_Js",{
var fieldSelected = fieldSelect.find('option:selected');
var fieldSpecificType = this.getFieldSpecificType(fieldSelected)
var conditionList = this.getConditionListFromType(fieldSpecificType);
+ console.log('Condition list is => ');
+ console.log(conditionList);
+
+ var fieldInfo = fieldSelected.data('fieldinfo');
+ if(typeof fieldInfo != 'undefined') {
+ fieldType = fieldInfo.type;
+ }
//for none in field name
if(typeof conditionList == 'undefined') {
conditionList = {};
@@ -225,6 +232,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];
--
GitLab