github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-31 21:08:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Remove Discourse.User and import instead

Browse Source
This commit is contained in:
Mark VanLandingham
2019-11-12 10:38:51 -06:00
committed by Robin Ward
parent 0a14b9b42a
commit f9894aec97
29 changed files with 86 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/admin/routes/admin-backups.js.es6
View File

@ -5,6 +5,7 @@ import showModal from "discourse/lib/show-modal";
import BackupStatus from "admin/models/backup-status";
import Backup from "admin/models/backup";
import PreloadStore from "preload-store";
import User from "discourse/models/user";
const LOG_CHANNEL = "/admin/backups/logs";
@ -12,7 +13,7 @@ export default DiscourseRoute.extend({
activate() {
this.messageBus.subscribe(LOG_CHANNEL, log => {
if (log.message === "[STARTED]") {
Discourse.User.currentProp("hideReadOnlyAlert", true);
User.currentProp("hideReadOnlyAlert", true);
this.controllerFor("adminBackups").set(
"model.isOperationRunning",
true
@ -31,7 +32,7 @@ export default DiscourseRoute.extend({
})
);
} else if (log.message === "[SUCCESS]") {
Discourse.User.currentProp("hideReadOnlyAlert", false);
User.currentProp("hideReadOnlyAlert", false);
this.controllerFor("adminBackups").set(
"model.isOperationRunning",
false