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

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

View File

@@ -1,4 +1,6 @@
import showModal from 'discourse/lib/show-modal';
import BackupStatus from 'admin/models/backup-status';
import Backup from 'admin/models/backup';
const LOG_CHANNEL = "/admin/backups/logs";
@@ -31,7 +33,7 @@ export default Discourse.Route.extend({
return PreloadStore.getAndRemove("operations_status", function() {
return Discourse.ajax("/admin/backups/status.json");
}).then(status => {
return Discourse.BackupStatus.create({
return BackupStatus.create({
isOperationRunning: status.is_operation_running,
canRollback: status.can_rollback,
allowRestore: status.allow_restore
@@ -98,7 +100,7 @@ export default Discourse.Route.extend({
I18n.t("yes_value"),
function(confirmed) {
if (confirmed) {
Discourse.Backup.cancel().then(function() {
Backup.cancel().then(function() {
self.controllerFor("adminBackups").set("model.isOperationRunning", false);
});
}
@@ -112,7 +114,7 @@ export default Discourse.Route.extend({
I18n.t("no_value"),
I18n.t("yes_value"),
function(confirmed) {
if (confirmed) { Discourse.Backup.rollback(); }
if (confirmed) { Backup.rollback(); }
}
);
},
@@ -120,7 +122,7 @@ export default Discourse.Route.extend({
uploadSuccess(filename) {
const self = this;
bootbox.alert(I18n.t("admin.backups.upload.success", { filename: filename }), function() {
Discourse.Backup.find().then(function (backups) {
Backup.find().then(function (backups) {
self.controllerFor("adminBackupsIndex").set("model", backups);
});
});