diff --git a/ghost/admin/app/components/member/activity-feed.hbs b/ghost/admin/app/components/member/activity-feed.hbs index c514738de5..daee7699b8 100644 --- a/ghost/admin/app/components/member/activity-feed.hbs +++ b/ghost/admin/app/components/member/activity-feed.hbs @@ -23,14 +23,21 @@
- - {{capitalize-first-letter event.action}} - {{event.object}} - - {{#if event.email}} - "" +
+ + {{capitalize-first-letter event.action}} + {{event.object}} + + {{#if event.email}} + "" + {{/if}} + {{event.info}} +
+ {{#if event.subtitle}} + + {{event.subtitle}} + {{/if}} - {{event.info}}
{{moment-from-now event.timestamp}} diff --git a/ghost/admin/app/helpers/parse-member-event.js b/ghost/admin/app/helpers/parse-member-event.js index d87a768d0f..ac9fd95541 100644 --- a/ghost/admin/app/helpers/parse-member-event.js +++ b/ghost/admin/app/helpers/parse-member-event.js @@ -7,6 +7,8 @@ export default function parseMemberEvent(event, hasMultipleNewsletters) { let action = getAction(event); let object = getObject(event, hasMultipleNewsletters); let info = getInfo(event); + const subtitle = getSubtitle(event); + const url = getURL(event); let timestamp = moment(event.data.created_at); return { @@ -19,6 +21,8 @@ export default function parseMemberEvent(event, hasMultipleNewsletters) { action, object, info, + subtitle, + url, timestamp }; } @@ -186,3 +190,27 @@ function getInfo(event) { }*/ return; } + +/** + * subtitle with an optional url property that is shown in gray and can be clickable + */ +function getSubtitle(event) { + if (event.type === 'comment_event') { + if (event.data.post) { + return event.data.post.title; + } + } + return; +} + +/** + * Make the event clickable + */ +function getURL(event) { + if (event.type === 'comment_event') { + if (event.data.post) { + return event.data.post.url; + } + } + return; +}