From: Kohei Yoshino <kohei.yoshino@gmail.com>
Date: Fri, 26 Jul 2019 18:53:48 +0000 (-0400)
Subject: Bug 1569194 - My Dashboard shows Unexpected Error dialog when request is aborted... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=012dcec8a29b24d404fa203cfc65c1de5fb22d3d;p=thirdparty%2Fbugzilla.git

Bug 1569194 - My Dashboard shows Unexpected Error dialog when request is aborted while loading
---

diff --git a/extensions/MyDashboard/web/js/flags.js b/extensions/MyDashboard/web/js/flags.js
index b9c716912..401d5e089 100644
--- a/extensions/MyDashboard/web/js/flags.js
+++ b/extensions/MyDashboard/web/js/flags.js
@@ -43,7 +43,7 @@ $(function () {
                 Y.one(`#${type}_loading`).addClass('bz_default_hidden');
                 Y.one(`#${type}_count_refresh`).removeClass('bz_default_hidden');
 
-                alert(`Failed to load requests:\n\n${message}`);
+                dataTable[type].showMessage(`Failed to load requests.`);
             }
         };
 
diff --git a/extensions/MyDashboard/web/js/query.js b/extensions/MyDashboard/web/js/query.js
index 6a1bc0398..539b567d8 100644
--- a/extensions/MyDashboard/web/js/query.js
+++ b/extensions/MyDashboard/web/js/query.js
@@ -84,7 +84,7 @@ $(function() {
                 Y.one('#query_loading').addClass('bz_default_hidden');
                 Y.one('#query_count_refresh').removeClass('bz_default_hidden');
 
-                alert(`Failed to load bug list from Bugzilla:\n\n${message}`);
+                bugQueryTable.showMessage(`Failed to load bug list.`);
             }
         };
 
@@ -124,6 +124,8 @@ $(function() {
         bugQueryTable.plug(Y.Plugin.DataTableRowExpansion, {
             uniqueIdKey: 'bug_id',
             template: ({ bug_id, changeddate_api }) => {
+                bugQueryTable.hideMessage();
+
                 // Note: `async` doesn't work for this `template` function, so use an inner `async` function instead
                 if (!lastChangesCache[bug_id]) {
                     try {
@@ -137,7 +139,7 @@ $(function() {
                             Y.one('#last_changes_stub_' + bug_id).setHTML(last_changes_template(last_changes));
                         })();
                     } catch ({ message }) {
-                        alert(`Failed to load last changes from Bugzilla:\n\n${message}`);
+                        bugQueryTable.showMessage(`Failed to load last changes.`);
                     }
 
                     return stub_template({bug_id: bug_id});