summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Lawrence <dlawrence@mozilla.com>2013-03-08 23:29:04 +0100
committerDave Lawrence <dlawrence@mozilla.com>2013-03-08 23:29:04 +0100
commit56e73d5a1cfec0ce4e1e854b22d5a06becbaf026 (patch)
tree890b0221e83af677ddc64bb0bc1a704282dd9636
parentc37a505409f6cb276d3b768af60e50c096bcba70 (diff)
downloadbugzilla-56e73d5a1cfec0ce4e1e854b22d5a06becbaf026.tar.gz
bugzilla-56e73d5a1cfec0ce4e1e854b22d5a06becbaf026.tar.xz
Bug 848232 - dashboard should not say "0 bugs found" if query hasn't completed yet
-rw-r--r--extensions/MyDashboard/template/en/default/pages/mydashboard.html.tmpl18
-rw-r--r--extensions/MyDashboard/web/js/flags.js3
-rw-r--r--extensions/MyDashboard/web/js/query.js3
3 files changed, 18 insertions, 6 deletions
diff --git a/extensions/MyDashboard/template/en/default/pages/mydashboard.html.tmpl b/extensions/MyDashboard/template/en/default/pages/mydashboard.html.tmpl
index 72705eb02..48ab15c9b 100644
--- a/extensions/MyDashboard/template/en/default/pages/mydashboard.html.tmpl
+++ b/extensions/MyDashboard/template/en/default/pages/mydashboard.html.tmpl
@@ -92,8 +92,10 @@
<div id="query_container">
<div class="query_heading"></div>
<div class="query_description"></div>
- <span class="items_found" id="query_bugs_found">0 [% terms.bugs %] found</span>
- | <a class="refresh" href="javascript:void(0);" id="query_refresh">Refresh</a>
+ <span id="query_count_refresh" class="bz_default_hidden">
+ <span class="items_found" id="query_bugs_found">0 [% terms.bugs %] found</span>
+ | <a class="refresh" href="javascript:void(0);" id="query_refresh">Refresh</a>
+ </span>
<div id="query_pagination_top"></div>
<div id="query_table"></div>
</div>
@@ -110,8 +112,10 @@
<div class="query_heading">
Flags Requested of You
</div>
- <span class="items_found" id="requestee_flags_found">0 flags found</span>
- | <a class="refresh" href="javascript:void(0);" id="requestee_refresh">Refresh</a>
+ <span id="requestee_count_refresh" class="bz_default_hidden">
+ <span class="items_found" id="requestee_flags_found">0 flags found</span>
+ | <a class="refresh" href="javascript:void(0);" id="requestee_refresh">Refresh</a>
+ </span>
<div id="requestee_table"></div>
</div>
@@ -119,8 +123,10 @@
<div class="query_heading">
Flags You Have Requested
</div>
- <span class="items_found" id="requester_flags_found">0 flags found</span>
- | <a class="refresh" href="javascript:void(0);" id="requester_refresh">Refresh</a>
+ <span id="requester_count_refresh" class="bz_default_hidden">
+ <span class="items_found" id="requester_flags_found">0 flags found</span>
+ | <a class="refresh" href="javascript:void(0);" id="requester_refresh">Refresh</a>
+ </span>
<div id="requester_table"></div>
</div>
</div>
diff --git a/extensions/MyDashboard/web/js/flags.js b/extensions/MyDashboard/web/js/flags.js
index fc360fdc1..8ea54539b 100644
--- a/extensions/MyDashboard/web/js/flags.js
+++ b/extensions/MyDashboard/web/js/flags.js
@@ -31,6 +31,7 @@ YUI({
var callback = {
success: function(e) {
if (e.response) {
+ Y.one('#' + type + '_count_refresh').removeClass('bz_default_hidden');
Y.one("#" + type + "_flags_found").setHTML(
e.response.results.length + ' flags found');
dataTable[type].set('data', e.response.results);
@@ -51,6 +52,8 @@ YUI({
var stringified = Y.JSON.stringify(json_object);
+ Y.one('#' + type + '_count_refresh').addClass('bz_default_hidden');
+
dataTable[type].set('data', []);
dataTable[type].render("#" + type + "_table");
dataTable[type].showMessage('loadingMessage');
diff --git a/extensions/MyDashboard/web/js/query.js b/extensions/MyDashboard/web/js/query.js
index 2ce438509..62d373e65 100644
--- a/extensions/MyDashboard/web/js/query.js
+++ b/extensions/MyDashboard/web/js/query.js
@@ -49,6 +49,7 @@ YUI({
var callback = {
success: function(e) {
if (e.response) {
+ Y.one('#query_count_refresh').removeClass('bz_default_hidden');
Y.one("#query_container .query_description").setHTML(e.response.meta.description);
Y.one("#query_container .query_heading").setHTML(e.response.meta.heading);
Y.one("#query_bugs_found").setHTML(
@@ -72,6 +73,8 @@ YUI({
var stringified = Y.JSON.stringify(json_object);
+ Y.one('#query_count_refresh').addClass('bz_default_hidden');
+
dataTable.set('data', []);
dataTable.render("#query_table");
dataTable.showMessage('loadingMessage');