From 8314b05fcee5f11dd8c66abafc77aa1f9cd48276 Mon Sep 17 00:00:00 2001 From: Vlad Date: Thu, 1 Jun 2017 14:37:26 -0400 Subject: [PATCH] Displays "not yet sent" as a sent date when post notification has not yet been sent/being sent --- .../js/src/newsletters/listings/notification_history.jsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/assets/js/src/newsletters/listings/notification_history.jsx b/assets/js/src/newsletters/listings/notification_history.jsx index e94430140b..2aef6f5d04 100644 --- a/assets/js/src/newsletters/listings/notification_history.jsx +++ b/assets/js/src/newsletters/listings/notification_history.jsx @@ -55,6 +55,11 @@ const newsletter_actions = [ const NewsletterListNotificationHistory = React.createClass({ mixins: [ QueueMixin, StatisticsMixin, MailerMixin ], + renderSentDate: function(newsletter) { + return (newsletter.queue.status === 'completed') + ? ( { MailPoet.Date.format(newsletter.updated_at) } ) + : MailPoet.I18n.t('notSentYet') + }, renderItem: function(newsletter, actions, meta) { const rowClasses = classNames( 'manage-column', @@ -91,7 +96,7 @@ const NewsletterListNotificationHistory = React.createClass({ ) : null } - { MailPoet.Date.format(newsletter.updated_at) } + { this.renderSentDate(newsletter) } );