IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FEATURE: flag resolution in admin screen

Browse Source
This commit is contained in:
Sam
2014-06-24 13:20:57 +10:00
parent bd13fedba5
commit c23a4fcbee
4 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/javascripts/admin/models/flagged_post.js
View File

@@ -23,8 +23,17 @@ Discourse.FlaggedPost = Discourse.Post.extend({
r = [];
_.each(this.post_actions, function(action) {
var user = _this.userLookup[action.user_id];
var deletedBy = null;
if(action.deleted_by_id){
deletedBy = _this.userLookup[action.deleted_by_id];
}
var flagType = I18n.t('admin.flags.summary.action_type_' + action.post_action_type_id, {count: 1});
r.push({user: user, flagType: flagType, flaggedAt: action.created_at});
r.push({
user: user, flagType: flagType, flaggedAt: action.created_at, deletedBy: deletedBy,
tookAction: action.staff_took_action, deletedAt: action.deleted_at
});
});
return r;
}.property(),