IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2026-08-09 04:28:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add loading route support to admin flags

Browse Source
This commit is contained in:
Robin Ward
2014-11-11 15:48:13 -05:00
parent dc4da6b013
commit 873277ae5f
11 changed files with 195 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/admin/controllers/admin-agree-flag.js.es6
+2 -2
View File
@@ -2,10 +2,10 @@ import ModalFunctionality from 'discourse/mixins/modal-functionality';
import ObjectController from 'discourse/controllers/object';
export default ObjectController.extend(ModalFunctionality, {
needs: ["adminFlags"],
needs: ["admin-flags-list"],
_agreeFlag: function (actionOnPost) {
var adminFlagController = this.get("controllers.adminFlags");
var adminFlagController = this.get("controllers.admin-flags-list");
var post = this.get("content");
var self = this;
app/assets/javascripts/admin/controllers/admin-delete-flag.js.es6
+3 -4
View File
@@ -3,13 +3,12 @@ import ModalFunctionality from 'discourse/mixins/modal-functionality';
import ObjectController from 'discourse/controllers/object';
export default ObjectController.extend(ModalFunctionality, {
needs: ["adminFlags"],
needs: ["admin-flags-list"],
actions: {
deletePostDeferFlag: function () {
var adminFlagController = this.get("controllers.adminFlags");
var adminFlagController = this.get("controllers.admin-flags-list");
var post = this.get("content");
var self = this;
@@ -22,7 +21,7 @@ export default ObjectController.extend(ModalFunctionality, {
},
deletePostAgreeFlag: function () {
var adminFlagController = this.get("controllers.adminFlags");
var adminFlagController = this.get("controllers.admin-flags-list");
var post = this.get("content");
var self = this;
app/assets/javascripts/admin/controllers/admin-flags.js.es6 → app/assets/javascripts/admin/controllers/admin-flags-list.js.es6
+1 -9
View File
@@ -1,18 +1,10 @@
/**
This controller supports the interface for dealing with flags in the admin section.
@class AdminFlagsController
@extends Ember.Controller
@namespace Discourse
@module Discourse
**/
export default Ember.ArrayController.extend({
query: null,
adminOldFlagsView: Em.computed.equal("query", "old"),
adminActiveFlagsView: Em.computed.equal("query", "active"),
actions: {
disagreeFlags: function (flaggedPost) {
var self = this;
flaggedPost.disagreeFlags().then(function () {