Merge pull request #581 from akieling/angular-patternfly-523

jeff-phillips-18 · web-flow · commit a91312c7bdac · 2017-08-21T10:43:45.000-04:00
fix(pfToolbar): enforce single select filter
diff --git a/src/toolbars/toolbar-component.js b/src/toolbars/toolbar-component.js
@@ -76,7 +76,7 @@ angular.module('patternfly.toolbars').component('pfToolbar', {
     }
 
     function enforceSingleSelect (filter) {
-      _.remove(ctrl.config.appliedFilters, {title: filter.title});
+      _.remove(ctrl.config.filterConfig.appliedFilters, {title: filter.title});
     }
 
     function addFilter (field, value) {
@@ -86,7 +86,7 @@ angular.module('patternfly.toolbars').component('pfToolbar', {
         value: value
       };
       if (!filterExists(newFilter)) {
-        if (newFilter.type === 'select') {
+        if (field.filterType === 'select') {
           enforceSingleSelect(newFilter);
         }
         ctrl.config.filterConfig.appliedFilters.push(newFilter);

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ angular.module('patternfly.toolbars').component('pfToolbar', {`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`function enforceSingleSelect (filter) {`
`79`		`- _.remove(ctrl.config.appliedFilters, {title: filter.title});`
	`79`	`+ _.remove(ctrl.config.filterConfig.appliedFilters, {title: filter.title});`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`function addFilter (field, value) {`
`@@ -86,7 +86,7 @@ angular.module('patternfly.toolbars').component('pfToolbar', {`
`86`	`86`	`value: value`
`87`	`87`	`};`
`88`	`88`	`if (!filterExists(newFilter)) {`
`89`		`- if (newFilter.type === 'select') {`
	`89`	`+ if (field.filterType === 'select') {`
`90`	`90`	`enforceSingleSelect(newFilter);`
`91`	`91`	`}`
`92`	`92`	`ctrl.config.filterConfig.appliedFilters.push(newFilter);`