QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-19 16:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Filter empty strings or nulls, and add more operators (#704)

Browse Source 
* Filter empty strings or nulls, and add more operators

* Encapsulate strings for translation
This commit is contained in:
x4base
2016-07-01 16:45:04 -05:00
committed by Maxime Beauchemin
parent 917bc984eb
commit d5b22dd86e
5 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
caravel/forms.py
View File

@@ -1009,12 +1009,14 @@ class FormFactory(object):
field_css_classes['granularity'] = ['form-control', 'select2_freeform']
field_css_classes['druid_time_origin'] = ['form-control', 'select2_freeform']
filter_choices = self.choicify(['in', 'not in', 'regex'])
having_op_choices = self.choicify(['>', '<', '=='])
having_op_choices = self.choicify(
['==', '!=', '>', '<', '>=', '<='])
filter_prefixes += ['having']
add_to_form(('since', 'until'))
# filter_cols defaults to ''. Filters with blank col will be ignored
filter_cols = self.choicify(
viz.datasource.filterable_column_names or [''])
([''] + viz.datasource.filterable_column_names) or [''])
having_cols = filter_cols + viz.datasource.metrics_combo
for field_prefix in filter_prefixes:
is_having_filter = field_prefix == 'having'