osr-plastic/osr-discourse-src
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "REFACTOR: support booting discourse with DISCOURSE_NO_CONSTANTS"

Browse Source 
This reverts commit c0b277d273.
This commit is contained in:
Robin Ward
2015-11-20 10:00:12 -05:00
parent 1c8b3c9447
commit c21457d6a7
99 changed files with 384 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/admin/controllers/admin-api.js.es6
+3 -5
View File
@@ -1,5 +1,3 @@
import ApiKey from 'admin/models/api-key';
/**
This controller supports the interface for dealing with API keys
@@ -18,7 +16,7 @@ export default Ember.ArrayController.extend({
**/
generateMasterKey: function() {
var self = this;
ApiKey.generateMasterKey().then(function (key) {
Discourse.ApiKey.generateMasterKey().then(function (key) {
self.get('model').pushObject(key);
});
},
@@ -27,7 +25,7 @@ export default Ember.ArrayController.extend({
Creates an API key instance with internal user object
@method regenerateKey
@param {ApiKey} key the key to regenerate
@param {Discourse.ApiKey} key the key to regenerate
**/
regenerateKey: function(key) {
bootbox.confirm(I18n.t("admin.api.confirm_regen"), I18n.t("no_value"), I18n.t("yes_value"), function(result) {
@@ -41,7 +39,7 @@ export default Ember.ArrayController.extend({
Revokes an API key
@method revokeKey
@param {ApiKey} key the key to revoke
@param {Discourse.ApiKey} key the key to revoke
**/
revokeKey: function(key) {
var self = this;
app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
+1 -2
View File
@@ -1,5 +1,4 @@
import { setting } from 'discourse/lib/computed';
import AdminDashboard from 'admin/models/admin-dashboard';
// This controller supports the default interface when you enter the admin section.
export default Ember.Controller.extend({
@@ -27,7 +26,7 @@ export default Ember.Controller.extend({
this.set('loadingProblems', true);
this.set('problemsFetchedAt', new Date());
var c = this;
AdminDashboard.fetchProblems().then(function(d) {
Discourse.AdminDashboard.fetchProblems().then(function(d) {
c.set('problems', d.problems);
c.set('loadingProblems', false);
if( d.problems && d.problems.length > 0 ) {
app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6
+1 -3
View File
@@ -1,5 +1,3 @@
import EmailPreview from 'admin/models/email-preview';
export default Ember.Controller.extend({
actions: {
@@ -7,7 +5,7 @@ export default Ember.Controller.extend({
const model = this.get('model');
this.set('loading', true);
EmailPreview.findDigest(this.get('lastSeen'), this.get('username')).then(email => {
Discourse.EmailPreview.findDigest(this.get('lastSeen'), this.get('username')).then(email => {
model.setProperties(email.getProperties('html_content', 'text_content'));
this.set('loading', false);
});
app/assets/javascripts/admin/controllers/admin-email-sent.js.es6
+1 -2
View File
@@ -1,11 +1,10 @@
import debounce from 'discourse/lib/debounce';
import EmailLog from 'admin/models/email-log';
export default Ember.Controller.extend({
filterEmailLogs: debounce(function() {
var self = this;
EmailLog.findAll(this.get("filter")).then(function(logs) {
Discourse.EmailLog.findAll(this.get("filter")).then(function(logs) {
self.set("model", logs);
});
}, 250).observes("filter.user", "filter.address", "filter.type", "filter.reply_key")
app/assets/javascripts/admin/controllers/admin-email-skipped.js.es6
+4 -2
View File
@@ -2,7 +2,9 @@ import debounce from 'discourse/lib/debounce';
export default Ember.Controller.extend({
filterEmailLogs: debounce(function() {
const EmailLog = require('admin/models/email-log').default;
EmailLog.findAll(this.get("filter")).then(logs => this.set("model", logs));
var self = this;
Discourse.EmailLog.findAll(this.get("filter")).then(function(logs) {
self.set("model", logs);
});
}, 250).observes("filter.user", "filter.address", "filter.type", "filter.skipped_reason")
});
app/assets/javascripts/admin/controllers/admin-flags-list.js.es6
+1 -3
View File
@@ -1,5 +1,3 @@
import FlaggedPost from 'admin/models/flagged-post';
export default Ember.ArrayController.extend({
query: null,
@@ -32,7 +30,7 @@ export default Ember.ArrayController.extend({
loadMore(){
var flags = this.get("model");
return FlaggedPost.findAll(this.get("query"),flags.length+1).then(function(data){
return Discourse.FlaggedPost.findAll(this.get("query"),flags.length+1).then(function(data){
if(data.length===0){
flags.set("allLoaded",true);
}
app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js.es6
+1 -2
View File
@@ -1,6 +1,5 @@
import { exportEntity } from 'discourse/lib/export-csv';
import { outputExportResult } from 'discourse/lib/export-result';
import ScreenedEmail from 'admin/models/screened-email';
export default Ember.ArrayController.extend({
loading: false,
@@ -21,7 +20,7 @@ export default Ember.ArrayController.extend({
show() {
var self = this;
self.set('loading', true);
ScreenedEmail.findAll().then(function(result) {
Discourse.ScreenedEmail.findAll().then(function(result) {
self.set('model', result);
self.set('loading', false);
});
app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6
+2 -3
View File
@@ -1,7 +1,6 @@
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,
@@ -11,7 +10,7 @@ export default Ember.ArrayController.extend({
show: debounce(function() {
var self = this;
self.set('loading', true);
ScreenedIpAddress.findAll(this.get("filter")).then(function(result) {
Discourse.ScreenedIpAddress.findAll(this.get("filter")).then(function(result) {
self.set('model', result);
self.set('loading', false);
});
@@ -27,7 +26,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 ScreenedIpAddress.rollUp().then(function(results) {
return Discourse.ScreenedIpAddress.rollUp().then(function(results) {
if (results && results.subnets) {
if (results.subnets.length > 0) {
self.send("show");
app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js.es6
+1 -2
View File
@@ -1,6 +1,5 @@
import { exportEntity } from 'discourse/lib/export-csv';
import { outputExportResult } from 'discourse/lib/export-result';
import ScreenedUrl from 'admin/models/screened-url';
export default Ember.ArrayController.extend({
loading: false,
@@ -8,7 +7,7 @@ export default Ember.ArrayController.extend({
show() {
const self = this;
self.set('loading', true);
ScreenedUrl.findAll().then(function(result) {
Discourse.ScreenedUrl.findAll().then(function(result) {
self.set('model', result);
self.set('loading', false);
});
app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js.es6
+1 -2
View File
@@ -1,6 +1,5 @@
import { exportEntity } from 'discourse/lib/export-csv';
import { outputExportResult } from 'discourse/lib/export-result';
import StaffActionLog from 'admin/models/staff-action-log';
export default Ember.ArrayController.extend({
loading: false,
@@ -37,7 +36,7 @@ export default Ember.ArrayController.extend({
});
this.set('filterCount', count);
StaffActionLog.findAll(params).then(function(result) {
Discourse.StaffActionLog.findAll(params).then(function(result) {
self.set('model', result);
}).finally(function() {
self.set('loading', false);
app/assets/javascripts/admin/controllers/admin-permalinks.js.es6
+1 -2
View File
@@ -1,5 +1,4 @@
import debounce from 'discourse/lib/debounce';
import Permalink from 'admin/models/permalink';
export default Ember.ArrayController.extend({
loading: false,
@@ -8,7 +7,7 @@ export default Ember.ArrayController.extend({
show: debounce(function() {
var self = this;
self.set('loading', true);
Permalink.findAll(self.get("filter")).then(function(result) {
Discourse.Permalink.findAll(self.get("filter")).then(function(result) {
self.set('model', result);
self.set('loading', false);
});
app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6
+3 -4
View File
@@ -1,6 +1,5 @@
import debounce from 'discourse/lib/debounce';
import { i18n } from 'discourse/lib/computed';
import AdminUser from 'admin/models/admin-user';
export default Ember.ArrayController.extend({
query: null,
@@ -43,7 +42,7 @@ export default Ember.ArrayController.extend({
var self = this;
this.set('refreshing', true);
AdminUser.findAll(this.get('query'), { filter: this.get('listFilter'), show_emails: this.get('showEmails') }).then(function (result) {
Discourse.AdminUser.findAll(this.get('query'), { filter: this.get('listFilter'), show_emails: this.get('showEmails') }).then(function (result) {
self.set('model', result);
}).finally(function() {
self.set('refreshing', false);
@@ -52,14 +51,14 @@ export default Ember.ArrayController.extend({
actions: {
approveUsers: function() {
AdminUser.bulkApprove(this.get('model').filterProperty('selected'));
Discourse.AdminUser.bulkApprove(this.get('model').filterProperty('selected'));
this._refreshUsers();
},
rejectUsers: function() {
var maxPostAge = this.siteSettings.delete_user_max_post_age;
var controller = this;
AdminUser.bulkReject(this.get('model').filterProperty('selected')).then(function(result){
Discourse.AdminUser.bulkReject(this.get('model').filterProperty('selected')).then(function(result){
var message = I18n.t("admin.users.reject_successful", {count: result.success});
if (result.failed > 0) {
message += ' ' + I18n.t("admin.users.reject_failures", {count: result.failed});
app/assets/javascripts/admin/controllers/modals/admin-start-backup.js.es6
+1 -2
View File
@@ -1,5 +1,4 @@
import ModalFunctionality from 'discourse/mixins/modal-functionality';
import Backup from 'admin/models/backup';
export default Ember.Controller.extend(ModalFunctionality, {
needs: ["adminBackupsLogs"],
@@ -7,7 +6,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
_startBackup: function (withUploads) {
var self = this;
Discourse.User.currentProp("hideReadOnlyAlert", true);
Backup.start(withUploads).then(function() {
Discourse.Backup.start(withUploads).then(function() {
self.get("controllers.adminBackupsLogs").clear();
self.send("backupStarted");
});