From a1d65ae8f6b072ba7326a2b008151a6df6de4d7d Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 15 Apr 2016 10:38:02 +1000 Subject: [PATCH] UX: show topic title in email logs --- app/assets/javascripts/admin/templates/email-sent.hbs | 7 ++++--- app/assets/stylesheets/common/admin/admin_base.scss | 5 +++++ app/serializers/email_log_serializer.rb | 11 ++++++++++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/admin/templates/email-sent.hbs b/app/assets/javascripts/admin/templates/email-sent.hbs index ca5fb4aaa2a..56765cfadf0 100644 --- a/app/assets/javascripts/admin/templates/email-sent.hbs +++ b/app/assets/javascripts/admin/templates/email-sent.hbs @@ -31,11 +31,12 @@ {{l.to_address}} {{l.email_type}} - + {{#if l.post_url}} - {{l.reply_key}} + {{l.post_description}} + {{l.reply_key}} {{else}} - {{l.reply_key}} + {{l.reply_key}} {{/if}} diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss index 7be08fb75ec..b13c4a3bd8a 100644 --- a/app/assets/stylesheets/common/admin/admin_base.scss +++ b/app/assets/stylesheets/common/admin/admin_base.scss @@ -1783,6 +1783,11 @@ table#user-badges { .time { width: 50px; } + .reply-key { + display: block; + font-size: 12px; + color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 40%)); + } .username div { max-width: 180px; white-space: nowrap; diff --git a/app/serializers/email_log_serializer.rb b/app/serializers/email_log_serializer.rb index 07f336d4e37..4b4d1f875cf 100644 --- a/app/serializers/email_log_serializer.rb +++ b/app/serializers/email_log_serializer.rb @@ -8,7 +8,8 @@ class EmailLogSerializer < ApplicationSerializer :created_at, :skipped, :skipped_reason, - :post_url + :post_url, + :post_description has_one :user, serializer: BasicUserSerializer, embed: :objects @@ -24,4 +25,12 @@ class EmailLogSerializer < ApplicationSerializer object.post.present? end + def include_post_description? + object.post.present? && object.post.topic.present? + end + + def post_description + "#{object.post.topic.title} ##{object.post.post_number}" + end + end