Merge branch '6.2.x' into sstoyanov/bug-fix-#2951

IgniteUI · Nov 8, 2018 · acb1c82 · acb1c82
2 parents 938d241 + cdb7c42
commit acb1c82
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/projects/igniteui-angular/src/lib/grids/filtering/grid-filtering.service.ts b/projects/igniteui-angular/src/lib/grids/filtering/grid-filtering.service.ts
@@ -205,6 +205,14 @@ export class IgxFilteringService implements OnDestroy {
         for (let i = 0; i < expressionsList.length; i++) {
             currExpressionUI = expressionsList[i];
 
+            if (!currExpressionUI.expression.condition.isUnary && currExpressionUI.expression.searchVal === null) {
+                if (currExpressionUI.afterOperator === FilteringLogic.And && !currAndBranch) {
+                    currAndBranch = new FilteringExpressionsTree(FilteringLogic.And, columnId);
+                    expressionsTree.filteringOperands.push(currAndBranch);
+                }
+                continue;
+            }
+
             if ((currExpressionUI.beforeOperator === undefined || currExpressionUI.beforeOperator === null ||
                  currExpressionUI.beforeOperator === FilteringLogic.Or) &&
                 currExpressionUI.afterOperator === FilteringLogic.And) {