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

[forms] Fix handling of NULLs for chart or dashboard name #7078

Merged
merged 1 commit into from
Mar 25, 2019
Merged

[forms] Fix handling of NULLs for chart or dashboard name #7078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions superset/models/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ class Slice(Model, AuditMixinNullable, ImportMixin):
'viz_type', 'params', 'cache_timeout')

def __repr__(self):
return self.slice_name
return self.slice_name or str(self.id)

@property
def cls_model(self):
Expand Down Expand Up @@ -291,10 +291,14 @@ def explore_json_url(self):
def edit_url(self):
return '/chart/edit/{}'.format(self.id)

@property
def chart(self):
return self.slice_name or '<empty>'

@property
def slice_link(self):
url = self.slice_url
name = escape(self.slice_name)
name = escape(self.chart)
return Markup(f'<a href="{url}">{name}</a>')

def get_viz(self, force=False):
Expand Down Expand Up @@ -407,7 +411,7 @@ class Dashboard(Model, AuditMixinNullable, ImportMixin):
'description', 'css', 'slug')

def __repr__(self):
return self.dashboard_title
return self.dashboard_title or str(self.id)

@property
def table_names(self):
Expand Down Expand Up @@ -436,14 +440,18 @@ def url(self):
def datasources(self):
return {slc.datasource for slc in self.slices}

@property
def charts(self):
return [slc.chart for slc in self.slices]

@property
def sqla_metadata(self):
# pylint: disable=no-member
metadata = MetaData(bind=self.get_sqla_engine())
return metadata.reflect()

def dashboard_link(self):
title = escape(self.dashboard_title)
title = escape(self.dashboard_title or '<empty>')
return Markup(f'<a href="{self.url}">{title}</a>')

@property
Expand Down
4 changes: 2 additions & 2 deletions superset/views/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@ class DashboardModelView(SupersetModelView, DeleteMixin): # noqa
edit_columns = [
'dashboard_title', 'slug', 'owners', 'position_json', 'css',
'json_metadata']
show_columns = edit_columns + ['table_names', 'slices']
show_columns = edit_columns + ['table_names', 'charts']
search_columns = ('dashboard_title', 'slug', 'owners')
add_columns = edit_columns
base_order = ('changed_on', 'desc')
Expand All @@ -632,7 +632,7 @@ class DashboardModelView(SupersetModelView, DeleteMixin): # noqa
'dashboard_link': _('Dashboard'),
'dashboard_title': _('Title'),
'slug': _('Slug'),
'slices': _('Charts'),
'charts': _('Charts'),
'owners': _('Owners'),
'creator': _('Creator'),
'modified': _('Modified'),
Expand Down