fix comments

apache · Feb 11, 2020 · 1a048c3 · 1a048c3
1 parent 159164a
commit 1a048c3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/superset/migrations/versions/3325d4caccc8_dashboard_scoped_filters.py b/superset/migrations/versions/3325d4caccc8_dashboard_scoped_filters.py
@@ -72,22 +72,19 @@ def upgrade():
 
     dashboards = session.query(Dashboard).all()
     for i, dashboard in enumerate(dashboards):
-        print("scanning dashboard ({}/{}) >>>>".format(i + 1, len(dashboards)))
+        print(f"scanning dashboard ({i + 1}/{len(dashboards)}) >>>>")
         try:
             json_metadata = json.loads(dashboard.json_metadata or "{}")
             if "filter_scopes" in json_metadata:
                 continue
 
             filter_scopes = {}
-            slice_ids = [slice.id for slice in dashboard.slices]
-            filters = (
-                session.query(Slice)
-                .filter(and_(Slice.id.in_(slice_ids), Slice.viz_type == "filter_box"))
-                .all()
-            )
+            filters = [
+                slice for slice in dashboard.slices if slice.viz_type == "filter_box"
+            ]
 
             # if dashboard has filter_box
-            if len(filters):
+            if filters:
                 filter_scopes = convert_filter_scopes(json_metadata, filters)
 
             json_metadata.pop("filter_immune_slices", None)

diff --git a/superset/utils/dashboard_filter_scopes_converter.py b/superset/utils/dashboard_filter_scopes_converter.py
@@ -54,15 +54,15 @@ def add_filter_scope(filter_field, filter_id):
         slice_params = json.loads(filter_slice.params or "{}")
         configs = slice_params.get("filter_configs") or []
 
-        if slice_params.get("date_filter", False):
+        if slice_params.get("date_filter"):
             add_filter_scope("__time_range", filter_id)
-        if slice_params.get("show_sqla_time_column", False):
+        if slice_params.get("show_sqla_time_column"):
             add_filter_scope("__time_col", filter_id)
-        if slice_params.get("show_sqla_time_granularity", False):
+        if slice_params.get("show_sqla_time_granularity"):
             add_filter_scope("__time_grain", filter_id)
-        if slice_params.get("show_druid_time_granularity", False):
+        if slice_params.get("show_druid_time_granularity"):
             add_filter_scope("__granularity", filter_id)
-        if slice_params.get("show_druid_time_origin", False):
+        if slice_params.get("show_druid_time_origin"):
             add_filter_scope("druid_time_origin", filter_id)
         for config in configs:
             add_filter_scope(config.get("column"), filter_id)