Skip to content

Commit

Permalink
fix: MVC show saved query (#10781)
Browse files Browse the repository at this point in the history
* fix: MVC show saved query

* remove it completely

* fix lint
  • Loading branch information
dpgaspar authored Sep 4, 2020
1 parent bc4f98e commit c1ff1c5
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 54 deletions.
33 changes: 0 additions & 33 deletions superset/templates/superset/models/savedquery/show.html

This file was deleted.

22 changes: 1 addition & 21 deletions superset/views/sql_lab.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from flask_appbuilder.security.decorators import has_access, has_access_api
from flask_babel import lazy_gettext as _

from superset import db, get_feature_flags
from superset import db
from superset.constants import RouteMethod
from superset.models.sql_lab import Query, SavedQuery, TableSchema, TabState
from superset.typing import FlaskResponse
Expand Down Expand Up @@ -75,32 +75,12 @@ class SavedQueryView(
"changed_on": _("Changed on"),
}

show_template = "superset/models/savedquery/show.html"

def pre_add(self, item: "SavedQueryView") -> None:
item.user = g.user

def pre_update(self, item: "SavedQueryView") -> None:
self.pre_add(item)

@has_access
@expose("show/<pk>")
def show(self, pk: int) -> FlaskResponse:
pk = self._deserialize_pk_if_composite(pk)
widgets = self._show(pk)
query = self.datamodel.get(pk).to_json()
query["extra_json"] = json.loads(query["extra_json"])
payload = {"common": {"feature_flags": get_feature_flags(), "query": query}}

return self.render_template(
self.show_template,
pk=pk,
title=self.show_title,
widgets=widgets,
related_views=self._related_views,
bootstrap_data=json.dumps(payload, default=utils.json_iso_dttm_ser),
)


class SavedQueryViewApi(SavedQueryView): # pylint: disable=too-many-ancestors
include_route_methods = {
Expand Down

0 comments on commit c1ff1c5

Please sign in to comment.