- {{#each flaggedPost.flaggers as |flagger|}}
+ {{#each flaggedPost.post_actions as |postAction|}}
- {{#link-to 'adminUser' flagger.disposedBy class="disposer-avatar"}}
- {{avatar flagger.disposedBy imageSize="medium"}}
+ {{#link-to
+ 'adminUser'
+ postAction.disposed_by.id
+ postAction.disposed_by.username
+ class="disposer-avatar"}}
+ {{avatar postAction.disposed_by imageSize="medium"}}
{{/link-to}}
- {{format-age flagger.disposedAt}}
- {{{flagger.dispositionIcon}}}
- {{#if flagger.tookAction}}
+ {{format-age postAction.disposed_at}}
+ {{disposition-icon postAction.disposition}}
+ {{#if postAction.staff_took_action}}
{{d-icon "gavel" title="admin.flags.took_action"}}
{{/if}}
diff --git a/app/assets/javascripts/discourse/controllers/flag.js.es6 b/app/assets/javascripts/discourse/controllers/flag.js.es6
index b8ab2e8845b..84377f8892f 100644
--- a/app/assets/javascripts/discourse/controllers/flag.js.es6
+++ b/app/assets/javascripts/discourse/controllers/flag.js.es6
@@ -139,8 +139,9 @@ export default Ember.Controller.extend(ModalFunctionality, {
canDeleteSpammer: function() {
if (this.get("flagTopic")) return false;
- if (Discourse.User.currentProp('staff') && this.get('selected.name_key') === 'spam') {
- return this.get('userDetails.can_be_deleted') && this.get('userDetails.can_delete_all_posts');
+ if (this.currentUser.get('staff') && this.get('selected.name_key') === 'spam') {
+ return this.get('userDetails.can_be_deleted') &&
+ this.get('userDetails.can_delete_all_posts');
} else {
return false;
}
diff --git a/app/assets/javascripts/discourse/models/store.js.es6 b/app/assets/javascripts/discourse/models/store.js.es6
index 96086f068f9..e5138109b69 100644
--- a/app/assets/javascripts/discourse/models/store.js.es6
+++ b/app/assets/javascripts/discourse/models/store.js.es6
@@ -57,10 +57,19 @@ export default Ember.Object.extend({
findAll(type, findArgs) {
const adapter = this.adapterFor(type);
- return adapter.findAll(this, type, findArgs).then((result) => {
+
+ let store = this;
+ return adapter.findAll(this, type, findArgs).then(result => {
let results = this._resultSet(type, result);
if (adapter.afterFindAll) {
- results = adapter.afterFindAll(results);
+ results = adapter.afterFindAll(
+ results,
+ {
+ lookup(subType, id) {
+ return store._lookupSubType(subType, type, id, result);
+ }
+ }
+ );
}
return results;
});
@@ -231,6 +240,10 @@ export default Ember.Object.extend({
return Discourse.Category.findById(id);
}
+ if (root.meta && root.meta.types) {
+ subType = root.meta.types[subType] || subType;
+ }
+
const pluralType = this.pluralize(subType);
const collection = root[this.pluralize(subType)];
if (collection) {
diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6
index 5a2590d2792..5f920b58fd6 100644
--- a/app/assets/javascripts/discourse/routes/topic.js.es6
+++ b/app/assets/javascripts/discourse/routes/topic.js.es6
@@ -40,14 +40,14 @@ const TopicRoute = Discourse.Route.extend({
actions: {
showFlags(model) {
- showModal('flag', { model });
- this.controllerFor('flag').setProperties({ selected: null, flagTopic: false });
+ let controller = showModal('flag', { model });
+ controller.setProperties({ selected: null, flagTopic: false });
},
showFlagTopic() {
const model = this.modelFor('topic');
- showModal('flag', { model });
- this.controllerFor('flag').setProperties({ selected: null, flagTopic: true });
+ let controller = showModal('flag', { model });
+ controller.setProperties({ selected: null, flagTopic: true });
},
showTopicStatusUpdate() {
diff --git a/app/controllers/admin/flags_controller.rb b/app/controllers/admin/flags_controller.rb
index 9c0fcc3f01e..16d4b03fb69 100644
--- a/app/controllers/admin/flags_controller.rb
+++ b/app/controllers/admin/flags_controller.rb
@@ -10,22 +10,40 @@ class Admin::FlagsController < Admin::AdminController
# we may get out of sync, fix it here
PostAction.update_flagged_posts_count
- posts, topics, users = FlagQuery.flagged_posts_report(
+ posts, topics, users, post_actions = FlagQuery.flagged_posts_report(
current_user,
filter: params[:filter],
offset: params[:offset].to_i,
topic_id: params[:topic_id],
- per_page: Admin::FlagsController.flags_per_page
+ per_page: Admin::FlagsController.flags_per_page,
+ rest_api: params[:rest_api].present?
)
if posts.blank?
render json: { posts: [], topics: [], users: [] }
else
- render json: MultiJson.dump(
- posts: posts,
- topics: serialize_data(topics, FlaggedTopicSerializer),
- users: serialize_data(users, FlaggedUserSerializer)
- )
+ if params[:rest_api]
+ render_json_dump(
+ {
+ flagged_posts: posts,
+ topics: serialize_data(topics, FlaggedTopicSerializer),
+ users: serialize_data(users, FlaggedUserSerializer),
+ post_actions: post_actions
+ },
+ rest_serializer: true,
+ meta: {
+ types: {
+ disposed_by: 'user'
+ }
+ }
+ )
+ else
+ render_json_dump(
+ posts: posts,
+ topics: serialize_data(topics, FlaggedTopicSerializer),
+ users: serialize_data(users, FlaggedUserSerializer)
+ )
+ end
end
end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 50a36187232..fb587cd83d9 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -327,6 +327,7 @@ class ApplicationController < ActionController::Base
end
obj['extras'] = opts[:extras] if opts[:extras]
+ obj['meta'] = opts[:meta] if opts[:meta]
end
render json: MultiJson.dump(obj), status: opts[:status] || 200
diff --git a/lib/flag_query.rb b/lib/flag_query.rb
index be64f9966aa..dbbdd7964ee 100644
--- a/lib/flag_query.rb
+++ b/lib/flag_query.rb
@@ -60,9 +60,17 @@ module FlagQuery
.includes(related_post: { topic: { ordered_posts: :user } })
.where(post_id: post_ids)
+ all_post_actions = []
+
post_actions.each do |pa|
post = post_lookup[pa.post_id]
- post.post_actions ||= []
+
+ if opts[:rest_api]
+ post.post_action_ids ||= []
+ else
+ post.post_actions ||= []
+ end
+
# TODO: add serializer so we can skip this
action = {
id: pa.id,
@@ -101,7 +109,12 @@ module FlagQuery
action.merge!(permalink: related_topic.relative_url, conversation: conversation)
end
- post.post_actions << action
+ if opts[:rest_api]
+ post.post_action_ids << action[:id]
+ all_post_actions << action
+ else
+ post.post_actions << action
+ end
user_ids << pa.user_id
user_ids << pa.disposed_by_id if pa.disposed_by_id
@@ -115,7 +128,8 @@ module FlagQuery
[
posts,
Topic.with_deleted.where(id: topic_ids.to_a).to_a,
- User.includes(:user_stat).where(id: user_ids.to_a).to_a
+ User.includes(:user_stat).where(id: user_ids.to_a).to_a,
+ all_post_actions
]
end
diff --git a/test/javascripts/helpers/flag-pretender.js.es6 b/test/javascripts/helpers/flag-pretender.js.es6
index 5ce060aacf7..68ffd308664 100644
--- a/test/javascripts/helpers/flag-pretender.js.es6
+++ b/test/javascripts/helpers/flag-pretender.js.es6
@@ -36,19 +36,22 @@ export default function(helpers) {
this.get('/admin/flags/active.json', () => {
return response(200, {
- posts: [
+ flagged_posts: [
{
id: 1,
user_id: sam.id,
- post_actions: [{
- user_id: eviltrout.id,
- post_action_type_id: 8,
- name_key: 'spam'
- }]
+ post_action_ids: [1]
}
],
users: [eviltrout, sam],
topics: [],
+ post_actions: [{
+ id: 1,
+ user_id: eviltrout.id,
+ post_action_type_id: 8,
+ name_key: 'spam'
+ }],
+ "__rest_serializer": "1"
});
});