superset-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maximebeauche...@apache.org
Subject [incubator-superset] branch master updated: Change reference for slices to chart (#4049)
Date Wed, 13 Dec 2017 02:02:19 GMT
This is an automated email from the ASF dual-hosted git repository.

maximebeauchemin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git


The following commit(s) were added to refs/heads/master by this push:
     new c84211e  Change reference for slices to chart (#4049)
c84211e is described below

commit c84211ec449a6fc0e80f1e1b6df54cb4340ca3f7
Author: Hugh A. Miles II <hughmil3s@gmail.com>
AuthorDate: Tue Dec 12 18:02:17 2017 -0800

    Change reference for slices to chart (#4049)
    
    * change reference for slices to chart
    
    * change profile page reference
    
    * change reference for Associated Slices
    
    * change back to single quotes
    
    * fix other single quotes
    
    * linting
    
    * last one
    
    * fix test
---
 .../javascripts/profile/components/Favorites.jsx       |  6 +++---
 superset/connectors/base/views.py                      |  2 +-
 superset/connectors/druid/views.py                     |  2 +-
 superset/connectors/sqla/views.py                      |  2 +-
 superset/views/core.py                                 | 18 +++++++++---------
 tests/core_tests.py                                    |  2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/superset/assets/javascripts/profile/components/Favorites.jsx b/superset/assets/javascripts/profile/components/Favorites.jsx
index 3141bb0..e1748ad 100644
--- a/superset/assets/javascripts/profile/components/Favorites.jsx
+++ b/superset/assets/javascripts/profile/components/Favorites.jsx
@@ -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
       />
     );
@@ -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>
     );
diff --git a/superset/connectors/base/views.py b/superset/connectors/base/views.py
index 2794d18..46a7120 100644
--- a/superset/connectors/base/views.py
+++ b/superset/connectors/base/views.py
@@ -9,5 +9,5 @@ class DatasourceModelView(SupersetModelView):
         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])))
diff --git a/superset/connectors/druid/views.py b/superset/connectors/druid/views.py
index 66b3bc5..fcd4adb 100644
--- a/superset/connectors/druid/views.py
+++ b/superset/connectors/druid/views.py
@@ -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'),
diff --git a/superset/connectors/sqla/views.py b/superset/connectors/sqla/views.py
index 2f394ce..12f9d6d 100644
--- a/superset/connectors/sqla/views.py
+++ b/superset/connectors/sqla/views.py
@@ -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'),
diff --git a/superset/views/core.py b/superset/views/core.py
index 8307e4f..00254b4 100755
--- a/superset/views/core.py
+++ b/superset/views/core.py
@@ -405,10 +405,10 @@ appbuilder.add_view(
 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 = {
@@ -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'),
@@ -483,8 +483,8 @@ class SliceModelView(SupersetModelView, DeleteMixin):  # noqa
 
 appbuilder.add_view(
     SliceModelView,
-    'Slices',
-    label=__('Slices'),
+    'Charts',
+    label=__('Charts'),
     icon='fa-bar-chart',
     category='',
     category_icon='',)
@@ -496,7 +496,7 @@ class SliceAsync(SliceModelView):  # noqa
         'creator', 'modified', 'icons']
     label_columns = {
         'icons': ' ',
-        'slice_link': _('Slice'),
+        'slice_link': _('Chart'),
     }
 
 
@@ -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'),
diff --git a/tests/core_tests.py b/tests/core_tests.py
index e6381b7..bdc7585 100644
--- a/tests/core_tests.py
+++ b/tests/core_tests.py
@@ -548,7 +548,7 @@ class CoreTests(SupersetTestCase):
 
     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):

-- 
To stop receiving notification emails like this one, please contact
['"commits@superset.apache.org" <commits@superset.apache.org>'].

Mime
View raw message