diff --git a/ghost/admin/app/components/modal-post-history.hbs b/ghost/admin/app/components/modal-post-history.hbs index cbb831fc64..5edd143d15 100644 --- a/ghost/admin/app/components/modal-post-history.hbs +++ b/ghost/admin/app/components/modal-post-history.hbs @@ -61,9 +61,10 @@ {{gh-format-post-time revision.createdAt format="D MMM YYYY, HH:mm"}}{{this.timezone}} {{#if revision.latest}} Latest - {{#if (eq revision.postStatus "published")}} - {{{revision.postStatus}}} - {{/if}} + {{/if}} + + {{#if (eq revision.published_latest true)}} + Published {{/if}} diff --git a/ghost/admin/app/components/modal-post-history.js b/ghost/admin/app/components/modal-post-history.js index 02905ac84d..e48249e892 100644 --- a/ghost/admin/app/components/modal-post-history.js +++ b/ghost/admin/app/components/modal-post-history.js @@ -52,7 +52,12 @@ export default class ModalPostHistory extends Component { } get revisionList() { - return this.post.get('postRevisions').toArray().reverse().map((revision, index) => { + const revisions = this.post.get('postRevisions').toArray().reverse(); + const latestPublishedIndex = revisions.findIndex( + revision => revision.get('postStatus') === 'published' && revision.get('reason') === 'published' + ); + + return revisions.map((revision, index) => { return { lexical: revision.get('lexical'), selected: index === this.selectedRevisionIndex, @@ -66,7 +71,8 @@ export default class ModalPostHistory extends Component { name: revision.get('author.name') || 'Deleted staff user' }, postStatus: revision.get('postStatus'), - reason: revision.get('reason') + reason: revision.get('reason'), + published_latest: latestPublishedIndex !== -1 && latestPublishedIndex === index }; }); }