From efc7384e66bc77ef7f0a4621451319b4f2f00c78 Mon Sep 17 00:00:00 2001 From: Alex Rudyy Date: Tue, 12 Aug 2014 23:46:07 +0000 Subject: QPID-5987: Fix VHN/VH grid selection and display host statitics only if it is active git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1617628 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/java/resources/js/qpid/management/Broker.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'qpid/java/broker-plugins') diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js index fd30446d2b..51a6c761f1 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js @@ -339,7 +339,7 @@ define(["dojo/_base/xhr", var gridProperties = { height: 400, - selectionMode: "extended", + selectionMode: "single", plugins: { pagination: { pageSizes: [10, 25, 50, 100], @@ -349,10 +349,14 @@ define(["dojo/_base/xhr", gotoButton: true, maxPageStep: 4, position: "bottom" - }, - indirectSelection: true + } }}; + function isActiveVH(item) + { + return item && item.virtualhosts && item.virtualhosts[0].state=="ACTIVE"; + } + that.vhostsGrid = new UpdatableStore(that.brokerData.virtualhostnodes, query(".broker-virtualhosts")[0], [ @@ -376,17 +380,17 @@ define(["dojo/_base/xhr", }, { name: "Connections", field: "_item", width: "8%", formatter: function(item){ - return item && item.virtualhosts? item.virtualhosts[0].statistics.connectionCount: "N/A"; + return isActiveVH(item)? item.virtualhosts[0].statistics.connectionCount: "N/A"; } }, { name: "Queues", field: "_item", width: "8%", formatter: function(item){ - return item && item.virtualhosts? item.virtualhosts[0].statistics.queueCount: "N/A"; + return isActiveVH(item)? item.virtualhosts[0].statistics.queueCount: "N/A"; } }, { name: "Exchanges", field: "_item", width: "8%", formatter: function(item){ - return item && item.virtualhosts? item.virtualhosts[0].statistics.exchangeCount: "N/A"; + return isActiveVH(item)? item.virtualhosts[0].statistics.exchangeCount: "N/A"; } }, { @@ -517,6 +521,8 @@ define(["dojo/_base/xhr", } } }); + gridProperties.selectionMode = "extended"; + gridProperties.plugins.indirectSelection = true; that.portsGrid = new UpdatableStore(that.brokerData.ports, query(".broker-ports")[0], -- cgit v1.2.1