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

Change reference for slices to chart #4049

Merged
merged 8 commits into from
Dec 13, 2017
Merged

Change reference for slices to chart #4049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e6195f0
change reference for slices to chart
hughhhh Dec 12, 2017
f78d4f2
change profile page reference
hughhhh Dec 12, 2017
3b6efe2
change reference for Associated Slices
hughhhh Dec 12, 2017
24ccefc
change back to single quotes
hughhhh Dec 12, 2017
bc9bdb4
fix other single quotes
hughhhh Dec 12, 2017
b8993e0
linting
hughhhh Dec 12, 2017
a972b80
last one
hughhhh Dec 12, 2017
c286a0b
fix test
hughhhh Dec 13, 2017
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
6 changes: 3 additions & 3 deletions superset/assets/javascripts/profile/components/Favorites.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ export default class Favorites extends React.PureComponent {
<TableLoader
dataEndpoint={`/superset/fave_slices/${this.props.user.userId}/`}
className="table table-condensed"
columns={['slice', 'creator', 'favorited']}
columns={['chart', 'creator', 'favorited']}
mutator={mutator}
noDataText={t('No favorite slices yet, go click on stars!')}
noDataText={t('No favorite charts yet, go click on stars!')}
sortable
/>
);
Expand Down Expand Up @@ -59,7 +59,7 @@ export default class Favorites extends React.PureComponent {
<h3>{t('Dashboards')}</h3>
{this.renderDashboardTable()}
<hr />
<h3>{t('Slices')}</h3>
<h3>{t('Charts')}</h3>
{this.renderSliceTable()}
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion superset/connectors/base/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ def pre_delete(self, obj):
if obj.slices:
raise SupersetException(Markup(
'Cannot delete a datasource that has slices attached to it.'
"Here's the list of associated slices: " +
"Here's the list of associated charts: " +
''.join([o.slice_link for o in obj.slices])))
2 changes: 1 addition & 1 deletion superset/connectors/druid/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ class DruidDatasourceModelView(DatasourceModelView, DeleteMixin, YamlExportMixin
}
base_filters = [['id', DatasourceFilter, lambda: []]]
label_columns = {
'slices': _('Associated Slices'),
'slices': _('Associated Charts'),
'datasource_link': _('Data Source'),
'cluster': _('Cluster'),
'description': _('Description'),
Expand Down
2 changes: 1 addition & 1 deletion superset/connectors/sqla/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ class TableModelView(DatasourceModelView, DeleteMixin, YamlExportMixin): # noqa
}
base_filters = [['id', DatasourceFilter, lambda: []]]
label_columns = {
'slices': _('Associated Slices'),
'slices': _('Associated Charts'),
'link': _('Table'),
'changed_by_': _('Changed By'),
'database': _('Database'),
Expand Down
18 changes: 9 additions & 9 deletions superset/views/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,10 +405,10 @@ class AccessRequestsModelView(SupersetModelView, DeleteMixin):
class SliceModelView(SupersetModelView, DeleteMixin): # noqa
datamodel = SQLAInterface(models.Slice)

list_title = _('List Slices')
show_title = _('Show Slice')
add_title = _('Add Slice')
edit_title = _('Edit Slice')
list_title = _('List Charts')
show_title = _('Show Chart')
add_title = _('Add Chart')
edit_title = _('Edit Chart')

can_add = False
label_columns = {
Expand Down Expand Up @@ -449,7 +449,7 @@ class SliceModelView(SupersetModelView, DeleteMixin): # noqa
'modified': _('Last Modified'),
'owners': _('Owners'),
'params': _('Parameters'),
'slice_link': _('Slice'),
'slice_link': _('Chart'),
'slice_name': _('Name'),
'table': _('Table'),
'viz_type': _('Visualization Type'),
Expand Down Expand Up @@ -483,8 +483,8 @@ def add(self):

appbuilder.add_view(
SliceModelView,
'Slices',
label=__('Slices'),
'Charts',
label=__('Charts'),
icon='fa-bar-chart',
category='',
category_icon='',)
Expand All @@ -496,7 +496,7 @@ class SliceAsync(SliceModelView): # noqa
'creator', 'modified', 'icons']
label_columns = {
'icons': ' ',
'slice_link': _('Slice'),
'slice_link': _('Chart'),
}


Expand Down Expand Up @@ -556,7 +556,7 @@ class DashboardModelView(SupersetModelView, DeleteMixin): # noqa
'dashboard_link': _('Dashboard'),
'dashboard_title': _('Title'),
'slug': _('Slug'),
'slices': _('Slices'),
'slices': _('Charts'),
'owners': _('Owners'),
'creator': _('Creator'),
'modified': _('Modified'),
Expand Down
2 changes: 1 addition & 1 deletion tests/core_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@ def test_add_slices(self, username='admin'):

def test_gamma(self):
self.login(username='gamma')
assert 'List Slice' in self.get_resp('/slicemodelview/list/')
assert 'List Charts' in self.get_resp('/slicemodelview/list/')
assert 'List Dashboard' in self.get_resp('/dashboardmodelview/list/')

def test_csv_endpoint(self):
Expand Down