Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Temp hack to make druid filters work in dashboard #2300

Merged
merged 1 commit into from
Mar 1, 2017
Merged

Temp hack to make druid filters work in dashboard #2300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions superset/assets/javascripts/explorev2/components/controls/Filter.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,6 @@ export default class Filter extends React.Component {
// switching filter value between array/string when needed
if (strFilterOps.indexOf(filter.op) !== -1) {
// druid having filter or regex/==/!= filters
if (typeof filter.val !== 'string') {
this.props.changeFilter('val', filter.val.length > 0 ? filter.val[0] : '');
}
return (
<input
type="text"
Expand All @@ -113,9 +110,6 @@ export default class Filter extends React.Component {
/>
);
}
if (typeof filter.val === 'string') {
this.props.changeFilter('val', filter.val === '' ? [] : [filter.val]);
}
return (
<SelectControl
multi
Expand Down
2 changes: 2 additions & 0 deletions superset/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2579,6 +2579,8 @@ def get_filters(self, raw_filters):
cond = None
if op in ('in', 'not in'):
eq = [types.replace("'", '').strip() for types in eq]
elif not isinstance(flt['val'], basestring):
eq = eq[0] if len(eq) > 0 else ''
if col in self.num_cols:
if op in ('in', 'not in'):
eq = [utils.js_string_to_num(v) for v in eq]
Expand Down