IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Observers weren't working on admin email logs

Browse Source 
We were trying to observe a non-ember object which is undefined
behavior and was leaking to odd bugs. This replaces the `filter` object
with an Ember Object and things seem to work.
This commit is contained in:
Robin Ward 2020-10-09 14:53:40 -04:00
parent 3862036422
commit 195119b77c
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/assets/javascripts/admin/addon/controllers/admin-email-logs.js
View File

@ -1,9 +1,14 @@
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import EmailLog from "admin/models/email-log"; import EmailLog from "admin/models/email-log";
import EmberObject from "@ember/object";
export default Controller.extend({ export default Controller.extend({
loading: false, loading: false,
init() {
this._super(...arguments);
this.set("filter", EmberObject.create());
},
loadLogs(sourceModel, loadMore) { loadLogs(sourceModel, loadMore) {
if ((loadMore && this.loading) || this.get("model.allLoaded")) { if ((loadMore && this.loading) || this.get("model.allLoaded")) {
return; return;
@ -13,8 +18,14 @@ export default Controller.extend({
sourceModel = sourceModel || EmailLog; sourceModel = sourceModel || EmailLog;
let args = {};
Object.keys(this.filter).forEach((k) => {
if (this.filter[k]) {
args[k] = this.filter[k];
}
});
return sourceModel return sourceModel
.findAll(this.filter, loadMore ? this.get("model.length") : null) .findAll(args, loadMore ? this.get("model.length") : null)
.then((logs) => { .then((logs) => {
if (this.model && loadMore && logs.length < 50) { if (this.model && loadMore && logs.length < 50) {
this.model.set("allLoaded", true); this.model.set("allLoaded", true);

2
app/assets/javascripts/admin/addon/routes/admin-email-incomings.js
View File

@ -8,6 +8,6 @@ export default DiscourseRoute.extend({
setupController(controller, model) { setupController(controller, model) {
controller.set("model", model); controller.set("model", model);
controller.set("filter", { status: this.status }); controller.set("filter.status", this.status);
}, },
}); });