From 8ebe0749543d5b47eac8c2bd6fe0f4a7d205d92c Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Wed, 22 Jun 2016 16:14:07 -0700 Subject: [PATCH] [bugfix] filter widgets to apply on applicable Slices (#658) Also fixed a white on white issue on hover --- caravel/assets/visualizations/filter_box.css | 14 ++++++++++++++ caravel/viz.py | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/caravel/assets/visualizations/filter_box.css b/caravel/assets/visualizations/filter_box.css index efe69c5381..4316f25e56 100644 --- a/caravel/assets/visualizations/filter_box.css +++ b/caravel/assets/visualizations/filter_box.css @@ -6,3 +6,17 @@ .dashboard .filter_box .slice_container > div { padding-top: 0; } + +ul.select2-results li.select2-highlighted div.filter_box{ + color: black; + border-width: 1px; + border-style: solid; + border-color: #666; +} + +ul.select2-results div.filter_box{ + color: black; + border-style: solid; + border-width: 1px; + border-color: transparent; +} diff --git a/caravel/viz.py b/caravel/viz.py index 39e5c82185..c5353cb9d9 100644 --- a/caravel/viz.py +++ b/caravel/viz.py @@ -189,7 +189,8 @@ class BaseViz(object): for slice_filters in extra_filters.values(): for col, vals in slice_filters.items(): if col and vals: - filters += [(col, 'in', ",".join(vals))] + if col in self.datasource.filterable_column_names: + filters += [(col, 'in', ",".join(vals))] return filters def query_obj(self):