You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by ma...@apache.org on 2018/05/08 15:24:27 UTC
[incubator-superset] branch master updated: add 30 minutes support
under time granularity (#4954)
This is an automated email from the ASF dual-hosted git repository.
maximebeauchemin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
The following commit(s) were added to refs/heads/master by this push:
new 18e67f9 add 30 minutes support under time granularity (#4954)
18e67f9 is described below
commit 18e67f93de55d282b7da79c0cd166d0434d4ac85
Author: Yuance.Li <li...@gmail.com>
AuthorDate: Tue May 8 23:24:18 2018 +0800
add 30 minutes support under time granularity (#4954)
---
superset/assets/src/explore/controls.jsx | 1 +
superset/connectors/druid/models.py | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/superset/assets/src/explore/controls.jsx b/superset/assets/src/explore/controls.jsx
index 0bb2680..8dbba95 100644
--- a/superset/assets/src/explore/controls.jsx
+++ b/superset/assets/src/explore/controls.jsx
@@ -772,6 +772,7 @@ export const controls = {
['PT30S', '30 seconds'],
['PT1M', '1 minute'],
['PT5M', '5 minutes'],
+ ['PT30M', '30 minutes'],
['PT1H', '1 hour'],
['PT6H', '6 hour'],
['P1D', '1 day'],
diff --git a/superset/connectors/druid/models.py b/superset/connectors/druid/models.py
index 4ff5e5f..1b71707 100644
--- a/superset/connectors/druid/models.py
+++ b/superset/connectors/druid/models.py
@@ -529,8 +529,8 @@ class DruidDatasource(Model, BaseDatasource):
def time_column_grains(self):
return {
'time_columns': [
- 'all', '5 seconds', '30 seconds', '1 minute',
- '5 minutes', '1 hour', '6 hour', '1 day', '7 days',
+ 'all', '5 seconds', '30 seconds', '1 minute', '5 minutes'
+ '30 minutes', '1 hour', '6 hour', '1 day', '7 days',
'week', 'week_starting_sunday', 'week_ending_saturday',
'month',
],
@@ -762,6 +762,7 @@ class DruidDatasource(Model, BaseDatasource):
'30 seconds': 'PT30S',
'1 minute': 'PT1M',
'5 minutes': 'PT5M',
+ '30 minutes': 'PT30M',
'1 hour': 'PT1H',
'6 hour': 'PT6H',
'one day': 'P1D',
--
To stop receiving notification emails like this one, please contact
maximebeauchemin@apache.org.