Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: MVC show saved query #10781

Merged
merged 3 commits into from
Sep 4, 2020
Merged

fix: MVC show saved query #10781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c4e109f
fix: MVC show saved query
dpgaspar Sep 3, 2020
42e32fd
remove it completely
dpgaspar Sep 3, 2020
180443d
fix lint
dpgaspar Sep 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 0 additions & 33 deletions superset/templates/superset/models/savedquery/show.html
View file
Open in desktop

This file was deleted.

22 changes: 1 addition & 21 deletions superset/views/sql_lab.py
View file
Open in desktop
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