You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2014/08/11 18:27:39 UTC
svn commit: r1617324 -
/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
Author: orudyy
Date: Mon Aug 11 16:27:38 2014
New Revision: 1617324
URL: http://svn.apache.org/r1617324
Log:
QPID-5987: [Java Broker] Make VHN/VH grid consistent with other grids on broker tab in web management console
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js?rev=1617324&r1=1617323&r2=1617324&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js Mon Aug 11 16:27:38 2014
@@ -339,7 +339,7 @@ define(["dojo/_base/xhr",
var gridProperties = {
height: 400,
- selectionMode: "single",
+ selectionMode: "extended",
plugins: {
pagination: {
pageSizes: [10, 25, 50, 100],
@@ -373,20 +373,27 @@ define(["dojo/_base/xhr",
formatter: function(item){
return item && item.virtualhosts? item.virtualhosts[0].type: "N/A";
}
- },
- { name: "Connections", field: "_item", width: "10%",
+ },
+ { name: "Connections", field: "_item", width: "8%",
formatter: function(item){
- return item && item.virtualhosts? item.virtualhosts[0].statistics.connectionCount: 0;
+ return item && item.virtualhosts? item.virtualhosts[0].statistics.connectionCount: "N/A";
}
},
- { name: "Queues", field: "_item", width: "10%",
+ { name: "Queues", field: "_item", width: "8%",
formatter: function(item){
- return item && item.virtualhosts? item.virtualhosts[0].statistics.queueCount: 0;
+ return item && item.virtualhosts? item.virtualhosts[0].statistics.queueCount: "N/A";
}
},
- { name: "Exchanges", field: "_item", width: "10%",
+ { name: "Exchanges", field: "_item", width: "8%",
formatter: function(item){
- return item && item.virtualhosts? item.virtualhosts[0].statistics.exchangeCount: 0;
+ return item && item.virtualhosts? item.virtualhosts[0].statistics.exchangeCount: "N/A";
+ }
+ },
+ {
+ name: "Default", field: "_item", width: "6%",
+ formatter: function(item){
+ var val = item && item.virtualhosts? item.virtualhosts[0].name: null;
+ return "<input type='radio' disabled='disabled' "+(val == that.brokerData.defaultVirtualHost ? "checked='checked'": "")+" />";
}
}
], function(obj) {
@@ -424,6 +431,7 @@ define(["dojo/_base/xhr",
if (data.length == 1)
{
that.showVirtualHost(data[0], brokerObj);
+ that.vhostsGrid.grid.selection.clear();
}
});
@@ -434,6 +442,7 @@ define(["dojo/_base/xhr",
{
var item = data[0];
that.controller.show("virtualhostnode", item.name, brokerObj, item.id);
+ that.vhostsGrid.grid.selection.clear();
}
}
);
@@ -457,6 +466,7 @@ define(["dojo/_base/xhr",
var item = data[0];
util.sendRequest("api/latest/virtualhostnode/" + encodeURIComponent(item.name),
"PUT", {desiredState: "ACTIVE"});
+ that.vhostsGrid.grid.selection.clear();
}
});
@@ -473,6 +483,7 @@ define(["dojo/_base/xhr",
{
util.sendRequest("api/latest/virtualhostnode/" + encodeURIComponent(item.name),
"PUT", {desiredState: "STOPPED"});
+ that.vhostsGrid.grid.selection.clear();
}
}
});
@@ -486,6 +497,7 @@ define(["dojo/_base/xhr",
var host = item.virtualhosts[0];
util.sendRequest("api/latest/virtualhost/" + encodeURIComponent(item.name) + "/" + encodeURIComponent(host.name),
"PUT", {desiredState: "ACTIVE"});
+ that.vhostsGrid.grid.selection.clear();
}
});
@@ -501,12 +513,11 @@ define(["dojo/_base/xhr",
{
util.sendRequest("api/latest/virtualhost/" + encodeURIComponent(item.name) + "/" + encodeURIComponent(host.name),
"PUT", {desiredState: "STOPPED"});
+ that.vhostsGrid.grid.selection.clear();
}
}
});
- gridProperties.selectionMode="extended";
-
that.portsGrid =
new UpdatableStore(that.brokerData.ports, query(".broker-ports")[0],
[ { name: "Name", field: "name", width: "15%"},
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org