REFACTOR: support booting discourse with DISCOURSE_NO_CONSTANTS

This change is discussed here: https://meta.discourse.org/t/deprecating-es6-compatibility-layer/35821 Prior to this change we were not booting correctly with DISCOURSE_NO_CONSTANTS
2026-08-08 04:04:59 -05:00 · 2015-11-21 00:14:50 +11:00
parent f5b34d5f53
commit c0b277d273
98 changed files with 380 additions and 379 deletions
@@ -1,3 +1,5 @@
+import ApiKey from 'admin/models/api-key';
+
 /**
  This controller supports the interface for dealing with API keys

@@ -16,7 +18,7 @@ export default Ember.ArrayController.extend({
    **/
    generateMasterKey: function() {
      var self = this;
-      Discourse.ApiKey.generateMasterKey().then(function (key) {
+      ApiKey.generateMasterKey().then(function (key) {
        self.get('model').pushObject(key);
      });
    },
@@ -25,7 +27,7 @@ export default Ember.ArrayController.extend({
      Creates an API key instance with internal user object

      @method regenerateKey
-      @param {Discourse.ApiKey} key the key to regenerate
+      @param {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) {
@@ -39,7 +41,7 @@ export default Ember.ArrayController.extend({
      Revokes an API key

      @method revokeKey
-      @param {Discourse.ApiKey} key the key to revoke
+      @param {ApiKey} key the key to revoke
    **/
    revokeKey: function(key) {
      var self = this;
@@ -1,4 +1,5 @@
 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({
@@ -26,7 +27,7 @@ export default Ember.Controller.extend({
    this.set('loadingProblems', true);
    this.set('problemsFetchedAt', new Date());
    var c = this;
-    Discourse.AdminDashboard.fetchProblems().then(function(d) {
+    AdminDashboard.fetchProblems().then(function(d) {
      c.set('problems', d.problems);
      c.set('loadingProblems', false);
      if( d.problems && d.problems.length > 0 ) {
@@ -1,3 +1,5 @@
+import EmailPreview from 'admin/models/email-preview';
+
 export default Ember.Controller.extend({

  actions: {
@@ -5,7 +7,7 @@ export default Ember.Controller.extend({
      const model = this.get('model');

      this.set('loading', true);
-      Discourse.EmailPreview.findDigest(this.get('lastSeen'), this.get('username')).then(email => {
+      EmailPreview.findDigest(this.get('lastSeen'), this.get('username')).then(email => {
        model.setProperties(email.getProperties('html_content', 'text_content'));
        this.set('loading', false);
      });
@@ -1,10 +1,11 @@
 import debounce from 'discourse/lib/debounce';
+import EmailLog from 'admin/models/email-log';

 export default Ember.Controller.extend({

  filterEmailLogs: debounce(function() {
    var self = this;
-    Discourse.EmailLog.findAll(this.get("filter")).then(function(logs) {
+    EmailLog.findAll(this.get("filter")).then(function(logs) {
      self.set("model", logs);
    });
  }, 250).observes("filter.user", "filter.address", "filter.type", "filter.reply_key")
@@ -1,9 +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;
-    Discourse.EmailLog.findAll(this.get("filter")).then(function(logs) {
+    EmailLog.findAll(this.get("filter")).then(function(logs) {
      self.set("model", logs);
    });
  }, 250).observes("filter.user", "filter.address", "filter.type", "filter.skipped_reason")
@@ -1,3 +1,5 @@
+import FlaggedPost from 'admin/models/flagged-post';
+
 export default Ember.ArrayController.extend({
  query: null,

@@ -30,7 +32,7 @@ export default Ember.ArrayController.extend({

  loadMore(){
    var flags = this.get("model");
-    return Discourse.FlaggedPost.findAll(this.get("query"),flags.length+1).then(function(data){
+    return FlaggedPost.findAll(this.get("query"),flags.length+1).then(function(data){
      if(data.length===0){
        flags.set("allLoaded",true);
      }
@@ -1,5 +1,6 @@
 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,
@@ -20,7 +21,7 @@ export default Ember.ArrayController.extend({
  show() {
    var self = this;
    self.set('loading', true);
-    Discourse.ScreenedEmail.findAll().then(function(result) {
+    ScreenedEmail.findAll().then(function(result) {
      self.set('model', result);
      self.set('loading', false);
    });
@@ -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");
@@ -1,5 +1,6 @@
 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,
@@ -7,7 +8,7 @@ export default Ember.ArrayController.extend({
  show() {
    const self = this;
    self.set('loading', true);
-    Discourse.ScreenedUrl.findAll().then(function(result) {
+    ScreenedUrl.findAll().then(function(result) {
      self.set('model', result);
      self.set('loading', false);
    });
@@ -1,5 +1,6 @@
 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,
@@ -36,7 +37,7 @@ export default Ember.ArrayController.extend({
    });
    this.set('filterCount', count);

-    Discourse.StaffActionLog.findAll(params).then(function(result) {
+    StaffActionLog.findAll(params).then(function(result) {
      self.set('model', result);
    }).finally(function() {
      self.set('loading', false);
@@ -1,4 +1,5 @@
 import debounce from 'discourse/lib/debounce';
+import Permalink from 'admin/models/permalink';

 export default Ember.ArrayController.extend({
  loading: false,
@@ -7,7 +8,7 @@ export default Ember.ArrayController.extend({
  show: debounce(function() {
    var self = this;
    self.set('loading', true);
-    Discourse.Permalink.findAll(self.get("filter")).then(function(result) {
+    Permalink.findAll(self.get("filter")).then(function(result) {
      self.set('model', result);
      self.set('loading', false);
    });
@@ -1,5 +1,6 @@
 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,
@@ -42,7 +43,7 @@ export default Ember.ArrayController.extend({
    var self = this;
    this.set('refreshing', true);

-    Discourse.AdminUser.findAll(this.get('query'), { filter: this.get('listFilter'), show_emails: this.get('showEmails') }).then(function (result) {
+    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);
@@ -51,14 +52,14 @@ export default Ember.ArrayController.extend({

  actions: {
    approveUsers: function() {
-      Discourse.AdminUser.bulkApprove(this.get('model').filterProperty('selected'));
+      AdminUser.bulkApprove(this.get('model').filterProperty('selected'));
      this._refreshUsers();
    },

    rejectUsers: function() {
      var maxPostAge = this.siteSettings.delete_user_max_post_age;
      var controller = this;
-      Discourse.AdminUser.bulkReject(this.get('model').filterProperty('selected')).then(function(result){
+      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});
@@ -1,4 +1,5 @@
 import ModalFunctionality from 'discourse/mixins/modal-functionality';
+import Backup from 'admin/models/backup';

 export default Ember.Controller.extend(ModalFunctionality, {
  needs: ["adminBackupsLogs"],
@@ -6,7 +7,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
  _startBackup: function (withUploads) {
    var self = this;
    Discourse.User.currentProp("hideReadOnlyAlert", true);
-    Discourse.Backup.start(withUploads).then(function() {
+    Backup.start(withUploads).then(function() {
      self.get("controllers.adminBackupsLogs").clear();
      self.send("backupStarted");
    });