diff --git a/superset/assets/src/dashboard/actions/sliceEntities.js b/superset/assets/src/dashboard/actions/sliceEntities.js index 516a5144d1042..b635ea05f528f 100644 --- a/superset/assets/src/dashboard/actions/sliceEntities.js +++ b/superset/assets/src/dashboard/actions/sliceEntities.js @@ -56,9 +56,7 @@ export function fetchAllSlices(userId) { description: slice.description, description_markdown: slice.description_markeddown, viz_type: slice.viz_type, - modified: slice.modified - ? slice.modified.replace(/<[^>]*>/g, '') - : '', + modified: slice.modified, }; } }); diff --git a/superset/assets/src/dashboard/components/dnd/AddSliceDragPreview.jsx b/superset/assets/src/dashboard/components/dnd/AddSliceDragPreview.jsx index 485e4e317135b..1a50d4872a4be 100644 --- a/superset/assets/src/dashboard/components/dnd/AddSliceDragPreview.jsx +++ b/superset/assets/src/dashboard/components/dnd/AddSliceDragPreview.jsx @@ -54,9 +54,7 @@ function AddSliceDragPreview({ dragItem, slices, isDragging, currentOffset }) { transform: `translate(${currentOffset.x}px, ${currentOffset.y}px)`, }} sliceName={slice.slice_name} - lastModified={ - slice.modified ? slice.modified.replace(/<[^>]*>/g, '') : '' - } + lastModified={slice.modified} visType={slice.viz_type} datasourceLink={slice.datasource_link} /> diff --git a/superset/assets/src/dashboard/reducers/getInitialState.js b/superset/assets/src/dashboard/reducers/getInitialState.js index 13283ec13632e..59695636ce30f 100644 --- a/superset/assets/src/dashboard/reducers/getInitialState.js +++ b/superset/assets/src/dashboard/reducers/getInitialState.js @@ -92,7 +92,7 @@ export default function(bootstrapData) { datasource: slice.form_data.datasource, description: slice.description, description_markeddown: slice.description_markeddown, - modified: slice.modified ? slice.modified.replace(/<[^>]*>/g, '') : '', + modified: slice.modified, changed_on: new Date(slice.changed_on).getTime(), }; diff --git a/superset/models/helpers.py b/superset/models/helpers.py index 4b2976a99645d..113ec399113b0 100644 --- a/superset/models/helpers.py +++ b/superset/models/helpers.py @@ -282,8 +282,7 @@ def changed_on_(self): @renders('modified') def modified(self): - s = humanize.naturaltime(datetime.now() - self.changed_on) - return Markup('{}'.format(s)) + return humanize.naturaltime(datetime.now() - self.changed_on) @property def icons(self):