Merge pull request #5610 from StrangelyTyped/noterm-fix

Southpaw17 · web-flow · commit 4d2315e6b012 · 2016-09-09T15:59:57.000-04:00
fix(filter): Fix noTerm option for filtering
diff --git a/src/js/core/services/rowSearcher.js b/src/js/core/services/rowSearcher.js
@@ -124,10 +124,10 @@ module.service('rowSearcher', ['gridUtil', 'uiGridConstants', function (gridUtil
         }
     
         if ( !gridUtil.isNullOrUndefined(filter.term) ){
-          // it is possible to have noTerm.  We don't need to copy that across, it was just a flag to avoid
-          // getting the filter ignored if the filter was a function that didn't use a term
+          // it is possible to have noTerm.
           newFilter.term = rowSearcher.stripTerm(filter);
         }
+        newFilter.noTerm = filter.noTerm;
         
         if ( filter.condition ){
           newFilter.condition = filter.condition;

Original file line number	Diff line number	Diff line change
`@@ -124,10 +124,10 @@ module.service('rowSearcher', ['gridUtil', 'uiGridConstants', function (gridUtil`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`if ( !gridUtil.isNullOrUndefined(filter.term) ){`
`127`		`- // it is possible to have noTerm. We don't need to copy that across, it was just a flag to avoid`
`128`		`- // getting the filter ignored if the filter was a function that didn't use a term`
	`127`	`+ // it is possible to have noTerm.`
`129`	`128`	`newFilter.term = rowSearcher.stripTerm(filter);`
`130`	`129`	`}`
	`130`	`+ newFilter.noTerm = filter.noTerm;`
`131`	`131`
`132`	`132`	`if ( filter.condition ){`
`133`	`133`	`newFilter.condition = filter.condition;`