Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-07 12:02:53 +08:00
Code Packages Activity Actions 5

Revert "Revert "REFACTOR: support booting discourse with DISCOURSE_NO_CONSTANTS""

Browse source 
This reverts commit c21457d6a7.
This commit is contained in:
Sam 2015-11-21 12:27:06 +11:00
parent d8734fc542
commit 5c899c765b
99 changed files with 394 additions and 384 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6
View file

@ -1,6 +1,7 @@
import debounce from 'discourse/lib/debounce';
import { outputExportResult } from 'discourse/lib/export-result';
import { exportEntity } from 'discourse/lib/export-csv';
import ScreenedIpAddress from 'admin/models/screened-ip-address';
export default Ember.ArrayController.extend({
loading: false,
@ -10,7 +11,7 @@ export default Ember.ArrayController.extend({
show: debounce(function() {
var self = this;
self.set('loading', true);
Discourse.ScreenedIpAddress.findAll(this.get("filter")).then(function(result) {
ScreenedIpAddress.findAll(this.get("filter")).then(function(result) {
self.set('model', result);
self.set('loading', false);
});
@ -26,7 +27,7 @@ export default Ember.ArrayController.extend({
return bootbox.confirm(I18n.t("admin.logs.screened_ips.roll_up_confirm"), I18n.t("no_value"), I18n.t("yes_value"), function (confirmed) {
if (confirmed) {
self.set("loading", true);
return Discourse.ScreenedIpAddress.rollUp().then(function(results) {
return ScreenedIpAddress.rollUp().then(function(results) {
if (results && results.subnets) {
if (results.subnets.length > 0) {
self.send("show");