Skip to content

Commit

Permalink
Merge pull request apache#132 from michellethomas/fixing_filter_time_…
Browse files Browse the repository at this point in the history
…grain_33

Fixing issue with filter_box time grain control
  • Loading branch information
michellethomas authored Jul 1, 2019
2 parents 453402d + f71f67f commit 6c61316
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion superset/assets/src/explore/controls.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -915,7 +915,9 @@ export const controls = {
'The options here are defined on a per database ' +
'engine basis in the Superset source code.'),
mapStateToProps: state => ({
choices: (state.datasource) ? state.datasource.time_grain_sqla : null,
choices: (state.datasource) ?
state.datasource.time_grain_sqla || state.datasource.timeGrainSqla :
null,
}),
},

Expand Down

0 comments on commit 6c61316

Please sign in to comment.