From 42cfe5dfa5ff617f28ae37c9ad3bb237a535b996 Mon Sep 17 00:00:00 2001 From: Simon MacMullen Date: Fri, 28 Jun 2013 17:30:08 +0100 Subject: [PATCH] More thousands --- deps/rabbitmq_management/priv/www/js/formatters.js | 3 ++- deps/rabbitmq_management/priv/www/js/tmpl/queues.ejs | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/deps/rabbitmq_management/priv/www/js/formatters.js b/deps/rabbitmq_management/priv/www/js/formatters.js index b940b6e01c..471dcdfe14 100644 --- a/deps/rabbitmq_management/priv/www/js/formatters.js +++ b/deps/rabbitmq_management/priv/www/js/formatters.js @@ -192,6 +192,7 @@ function fmt_rate_num(num) { } function fmt_num_thousands(num) { + num = '' + num; if (num.length < 4) return num; return fmt_num_thousands(num.slice(0, -3)) + ',' + num.slice(-3); } @@ -238,7 +239,7 @@ function fmt_msgs0(obj, name, mode) { obj[name + '_details'] == undefined) return ''; var details = obj[name + '_details']; return mode == 'avg' ? fmt_rate_num(details.avg) : - fmt_num_thousands('' + obj[name]); + fmt_num_thousands(obj[name]); } function fmt_msgs_rate(num) { diff --git a/deps/rabbitmq_management/priv/www/js/tmpl/queues.ejs b/deps/rabbitmq_management/priv/www/js/tmpl/queues.ejs index cd3cd1a976..9598844b79 100644 --- a/deps/rabbitmq_management/priv/www/js/tmpl/queues.ejs +++ b/deps/rabbitmq_management/priv/www/js/tmpl/queues.ejs @@ -70,9 +70,9 @@ <%= fmt_parameters_short(queue) %> <%= fmt_string(queue.policy, '') %> <%= fmt_idle(queue) %> - <%= fmt_string(queue.messages_ready) %> - <%= fmt_string(queue.messages_unacknowledged) %> - <%= fmt_string(queue.messages) %> + <%= fmt_num_thousands(queue.messages_ready) %> + <%= fmt_num_thousands(queue.messages_unacknowledged) %> + <%= fmt_num_thousands(queue.messages) %> <% if (statistics_level == 'fine') { %> <%= fmt_rate(queue.message_stats, 'publish') %> <%= fmt_deliver_rate(queue.message_stats, col_redeliver) %>