Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FEATURE: use fancy title in notifications

This commit is contained in:
Sam 2017-05-15 15:38:21 -04:00
parent 31f27006e1
commit be8dd403df
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/widgets/notification-item.js.es6
View File

@ -59,6 +59,10 @@ createWidget('notification-item', {
const badgeName = data.badge_name; const badgeName = data.badge_name;
if (badgeName) { return escapeExpression(badgeName); } if (badgeName) { return escapeExpression(badgeName); }
if (this.attrs.fancy_title) {
return this.attrs.fancy_title;
}
const title = data.topic_title; const title = data.topic_title;
return Ember.isEmpty(title) ? "" : escapeExpression(title); return Ember.isEmpty(title) ? "" : escapeExpression(title);
}, },

9
app/serializers/notification_serializer.rb
View File

@ -6,6 +6,7 @@ class NotificationSerializer < ApplicationSerializer
:created_at, :created_at,
:post_number, :post_number,
:topic_id, :topic_id,
:fancy_title,
:slug, :slug,
:data, :data,
:is_warning :is_warning
@ -18,6 +19,14 @@ class NotificationSerializer < ApplicationSerializer
object.topic.present? && object.topic.subtype == TopicSubtype.moderator_warning object.topic.present? && object.topic.subtype == TopicSubtype.moderator_warning
end end
def include_fancy_title?
object.topic&.fancy_title
end
def fancy_title
object.topic.fancy_title
end
def include_is_warning? def include_is_warning?
is_warning is_warning
end end