fix: modified by column on charts and dashboards (#10340)

This commit is contained in:
Daniel Vaz Gaspar
2020-07-16 23:15:47 +01:00
committed by GitHub
parent e4c9c7364b
commit 2b061fc64b
6 changed files with 12 additions and 14 deletions

View File

@@ -146,8 +146,8 @@ class ChartList extends React.PureComponent<Props, State> {
},
},
}: any) => <a href={changedByUrl}>{changedByName}</a>,
Header: t('Creator'),
accessor: 'changed_by_fk',
Header: t('Modified By'),
accessor: 'changed_by.first_name',
},
{
Cell: ({

View File

@@ -161,8 +161,8 @@ class DashboardList extends React.PureComponent<Props, State> {
},
},
}: any) => <a href={changedByUrl}>{changedByName}</a>,
Header: t('Creator'),
accessor: 'changed_by_fk',
Header: t('Modified By'),
accessor: 'changed_by.first_name',
},
{
Cell: ({

View File

@@ -77,8 +77,8 @@ class DashboardTable extends React.PureComponent<
}) => <a href={url}>{dashboardTitle}</a>,
},
{
accessor: 'changed_by_fk',
Header: 'Creator',
accessor: 'changed_by.first_name',
Header: 'Modified By',
Cell: ({
row: {
original: { changed_by_name: changedByName, changedByUrl },

View File

@@ -106,8 +106,6 @@ class ChartRestApi(BaseSupersetModelRestApi):
"slice_name",
"url",
"description",
"changed_by_fk",
"created_by_fk",
"changed_by_name",
"changed_by_url",
"changed_by.first_name",
@@ -124,12 +122,12 @@ class ChartRestApi(BaseSupersetModelRestApi):
"params",
"cache_timeout",
]
list_select_columns = list_columns + ["changed_on"]
list_select_columns = list_columns + ["changed_on", "changed_by_fk"]
order_columns = [
"slice_name",
"viz_type",
"datasource_name",
"changed_by_fk",
"changed_by.first_name",
"changed_on_delta_humanized",
]
search_columns = (

View File

@@ -119,12 +119,12 @@ class DashboardRestApi(BaseSupersetModelRestApi):
"owners.first_name",
"owners.last_name",
]
list_select_columns = list_columns + ["changed_on"]
list_select_columns = list_columns + ["changed_on", "changed_by_fk"]
order_columns = [
"dashboard_title",
"changed_on_delta_humanized",
"published",
"changed_by_fk",
"changed_by.first_name",
]
add_columns = [

View File

@@ -366,8 +366,8 @@ class AuditMixinNullable(AuditMixin):
@property
def changed_by_name(self) -> str:
if self.created_by:
return escape("{}".format(self.created_by))
if self.changed_by:
return escape("{}".format(self.changed_by))
return ""
@renders("created_by")