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

Only initiate permissions of valid metrics (#630)

Browse Source
This commit is contained in:
x4base
2016-06-16 10:55:11 -05:00
committed by Maxime Beauchemin
parent 65d9feb0a9
commit db30f20341
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
caravel/models.py
View File

@@ -873,7 +873,7 @@ class SqlMetric(Model, AuditMixinNullable):
return (
"{parent_name}.[{obj.metric_name}](id:{obj.id})"
).format(obj=self,
parent_name=self.table.full_name)
parent_name=self.table.full_name) if self.table else None
class TableColumn(Model, AuditMixinNullable):
@@ -1372,7 +1372,9 @@ class DruidMetric(Model, AuditMixinNullable):
return (
"{parent_name}.[{obj.metric_name}](id:{obj.id})"
).format(obj=self,
parent_name=self.datasource.full_name)
parent_name=self.datasource.full_name
) if self.datasource else None
class DruidColumn(Model, AuditMixinNullable):

2
caravel/utils.py
View File

@@ -228,7 +228,7 @@ def init_metrics_perm(caravel, metrics=None):
for model in [models.SqlMetric, models.DruidMetric]:
metrics += list(db.session.query(model).all())
metric_perms = [metric.perm for metric in metrics]
metric_perms = filter(None, [metric.perm for metric in metrics])
for metric_perm in metric_perms:
merge_perm(sm, 'metric_access', metric_perm)