diff --git a/superset/connectors/druid/views.py b/superset/connectors/druid/views.py index 703ea399c..1c13b776e 100644 --- a/superset/connectors/druid/views.py +++ b/superset/connectors/druid/views.py @@ -41,7 +41,7 @@ from . import models class DruidColumnInlineView(CompactCRUDMixin, SupersetModelView): # noqa datamodel = SQLAInterface(models.DruidColumn) - list_title = _('List Druid Column') + list_title = _('Columns') show_title = _('Show Druid Column') add_title = _('Add Druid Column') edit_title = _('Edit Druid Column') @@ -109,7 +109,7 @@ appbuilder.add_view_no_menu(DruidColumnInlineView) class DruidMetricInlineView(CompactCRUDMixin, SupersetModelView): # noqa datamodel = SQLAInterface(models.DruidMetric) - list_title = _('List Druid Metric') + list_title = _('Metrics') show_title = _('Show Druid Metric') add_title = _('Add Druid Metric') edit_title = _('Edit Druid Metric') @@ -160,7 +160,7 @@ appbuilder.add_view_no_menu(DruidMetricInlineView) class DruidClusterModelView(SupersetModelView, DeleteMixin, YamlExportMixin): # noqa datamodel = SQLAInterface(models.DruidCluster) - list_title = _('List Druid Cluster') + list_title = _('Druid Clusters') show_title = _('Show Druid Cluster') add_title = _('Add Druid Cluster') edit_title = _('Edit Druid Cluster') @@ -212,7 +212,7 @@ appbuilder.add_view( class DruidDatasourceModelView(DatasourceModelView, DeleteMixin, YamlExportMixin): # noqa datamodel = SQLAInterface(models.DruidDatasource) - list_title = _('List Druid Datasource') + list_title = _('Druid Datasources') show_title = _('Show Druid Datasource') add_title = _('Add Druid Datasource') edit_title = _('Edit Druid Datasource') diff --git a/superset/connectors/sqla/views.py b/superset/connectors/sqla/views.py index 212d55133..6ba2f26ce 100644 --- a/superset/connectors/sqla/views.py +++ b/superset/connectors/sqla/views.py @@ -37,7 +37,7 @@ from . import models class TableColumnInlineView(CompactCRUDMixin, SupersetModelView): # noqa datamodel = SQLAInterface(models.TableColumn) - list_title = _('List Columns') + list_title = _('Columns') show_title = _('Show Column') add_title = _('Add Column') edit_title = _('Edit Column') @@ -110,7 +110,7 @@ appbuilder.add_view_no_menu(TableColumnInlineView) class SqlMetricInlineView(CompactCRUDMixin, SupersetModelView): # noqa datamodel = SQLAInterface(models.SqlMetric) - list_title = _('List Metrics') + list_title = _('Metrics') show_title = _('Show Metric') add_title = _('Add Metric') edit_title = _('Edit Metric') @@ -164,7 +164,7 @@ appbuilder.add_view_no_menu(SqlMetricInlineView) class TableModelView(DatasourceModelView, DeleteMixin, YamlExportMixin): # noqa datamodel = SQLAInterface(models.SqlaTable) - list_title = _('List Tables') + list_title = _('Tables') show_title = _('Show Table') add_title = _('Import a table definition') edit_title = _('Edit Table') diff --git a/superset/views/core.py b/superset/views/core.py index f7672f68e..677b46f93 100755 --- a/superset/views/core.py +++ b/superset/views/core.py @@ -146,7 +146,7 @@ class DashboardFilter(SupersetFilter): class DatabaseView(SupersetModelView, DeleteMixin, YamlExportMixin): # noqa datamodel = SQLAInterface(models.Database) - list_title = _('List Databases') + list_title = _('Databases') show_title = _('Show Database') add_title = _('Add Database') edit_title = _('Edit Database') @@ -446,7 +446,7 @@ class SliceModelView(SupersetModelView, DeleteMixin): # noqa route_base = '/chart' datamodel = SQLAInterface(models.Slice) - list_title = _('List Charts') + list_title = _('Charts') show_title = _('Show Chart') add_title = _('Add Chart') edit_title = _('Edit Chart') @@ -562,7 +562,7 @@ class DashboardModelView(SupersetModelView, DeleteMixin): # noqa route_base = '/dashboard' datamodel = SQLAInterface(models.Dashboard) - list_title = _('List Dashboards') + list_title = _('Dashboards') show_title = _('Show Dashboard') add_title = _('Add Dashboard') edit_title = _('Edit Dashboard') @@ -694,7 +694,7 @@ appbuilder.add_view_no_menu(DashboardAddView) class LogModelView(SupersetModelView): datamodel = SQLAInterface(models.Log) - list_title = _('List Log') + list_title = _('Logs') show_title = _('Show Log') add_title = _('Add Log') edit_title = _('Edit Log') @@ -2883,10 +2883,10 @@ appbuilder.add_view_no_menu(Superset) class CssTemplateModelView(SupersetModelView, DeleteMixin): datamodel = SQLAInterface(models.CssTemplate) - list_title = _('List Css Template') - show_title = _('Show Css Template') - add_title = _('Add Css Template') - edit_title = _('Edit Css Template') + list_title = _('CSS Templates') + show_title = _('Show CSS Template') + add_title = _('Add CSS Template') + edit_title = _('Edit CSS Template') list_columns = ['template_name'] edit_columns = ['template_name', 'css'] diff --git a/tests/core_tests.py b/tests/core_tests.py index 322e97440..514ef67f6 100644 --- a/tests/core_tests.py +++ b/tests/core_tests.py @@ -462,8 +462,8 @@ class CoreTests(SupersetTestCase): def test_gamma(self): self.login(username='gamma') - assert 'List Charts' in self.get_resp('/chart/list/') - assert 'List Dashboard' in self.get_resp('/dashboard/list/') + assert 'Charts' in self.get_resp('/chart/list/') + assert 'Dashboards' in self.get_resp('/dashboard/list/') def test_csv_endpoint(self): self.login('admin')