From 83f5f9176bf3ab2f2aa391ff03a7b78974cbaec5 Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Fri, 3 Apr 2020 14:13:01 +1100 Subject: [PATCH] DEV: only load staff logs when page is visited Previously we would load admin staff action logs unconditionally as soon as the controller was instantiated, this is not desirable we only want to run the query when you visit the route. --- .../admin/controllers/admin-logs-staff-action-logs.js | 3 +-- .../javascripts/admin/routes/admin-logs-staff-action-logs.js | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js b/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js index 849861c9210..7ef84b45ad8 100644 --- a/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js +++ b/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js @@ -4,7 +4,7 @@ import { scheduleOnce } from "@ember/runloop"; import Controller from "@ember/controller"; import { exportEntity } from "discourse/lib/export-csv"; import { outputExportResult } from "discourse/lib/export-result"; -import discourseComputed, { on } from "discourse-common/utils/decorators"; +import discourseComputed from "discourse-common/utils/decorators"; export default Controller.extend({ model: null, @@ -17,7 +17,6 @@ export default Controller.extend({ return name ? I18n.t("admin.logs.staff_actions.actions." + name) : null; }, - @on("init") resetFilters() { this.setProperties({ model: EmberObject.create({ loadingMore: true }), diff --git a/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js b/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js index 0ef8e6e2320..b007ecafa72 100644 --- a/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js +++ b/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js @@ -9,6 +9,11 @@ export default DiscourseRoute.extend({ }); }, + activate() { + let controller = this.controllerFor("admin-logs-staff-action-logs"); + if (controller.filters === null) controller.resetFilters(); + }, + actions: { showDetailsModal(model) { showModal("admin-staff-action-log-details", { model, admin: true });