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

FIX: error when loading admin > flags

This commit is contained in:
Régis Hanol 2015-08-28 12:31:32 +02:00
parent 71c1eccf2b
commit 727827dc25
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/templates/flags-list.hbs
View File

@ -32,7 +32,7 @@
<span class="private-message-glyph">{{fa-icon "envelope"}}</span> <span class="private-message-glyph">{{fa-icon "envelope"}}</span>
{{/if}} {{/if}}
{{topic-status topic=flaggedPost.topic}} {{topic-status topic=flaggedPost.topic}}
<a href='{{unbound flaggedPost.url}}'>{{{flaggedPost.topic.fancyTitle}}}</a> <a href='{{unbound flaggedPost.url}}'>{{{unbound flaggedPost.topic.fancyTitle}}}</a>
</h3> </h3>
{{#if flaggedPost.postAuthorFlagged}} {{#if flaggedPost.postAuthorFlagged}}
{{{flaggedPost.excerpt}}} {{{flaggedPost.excerpt}}}

1
app/assets/javascripts/discourse/models/topic.js.es6
View File

@ -10,6 +10,7 @@ const Topic = RestModel.extend({
@computed('fancy_title') @computed('fancy_title')
fancyTitle(title) { fancyTitle(title) {
title = title || "";
title = Discourse.Emoji.unescape(title); title = Discourse.Emoji.unescape(title);
return Discourse.CensoredWords.censor(title); return Discourse.CensoredWords.censor(title);
}, },

1
app/serializers/flagged_topic_serializer.rb
View File

@ -1,6 +1,7 @@
class FlaggedTopicSerializer < ActiveModel::Serializer class FlaggedTopicSerializer < ActiveModel::Serializer
attributes :id, attributes :id,
:title, :title,
:fancy_title,
:slug, :slug,
:archived, :archived,
:closed, :closed,