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

FIX: handles not found reports in bulk loading (#6582)

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2018-11-12 13:47:24 +01:00
committed by GitHub
parent 7c4d4331bc
commit 9c616e0679
7 changed files with 58 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/assets/javascripts/admin/components/admin-report.js.es6
View File

@ -111,7 +111,12 @@ export default Ember.Component.extend({
unregisterHoverTooltip($(".info[data-tooltip]"));
},
showError: Ember.computed.or("showTimeoutError", "showExceptionError"),
showError: Ember.computed.or(
"showTimeoutError",
"showExceptionError",
"showNotFoundError"
),
showNotFoundError: Ember.computed.equal("model.error", "not_found"),
showTimeoutError: Ember.computed.equal("model.error", "timeout"),
showExceptionError: Ember.computed.equal("model.error", "exception"),
@ -274,7 +279,7 @@ export default Ember.Component.extend({
if (!this.get("startDate") || !this.get("endDate")) {
report = sort(filteredReports)[0];
} else {
let reportKey = this.get("reportKey");
const reportKey = this.get("reportKey");
report = sort(
filteredReports.filter(r => r.report_key.includes(reportKey))
@ -283,6 +288,10 @@ export default Ember.Component.extend({
if (!report) return;
}
if (report.error === "not_found") {
this.set("showFilteringUI", false);
}
this._renderReport(
report,
this.get("forcedModes"),