summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js5
-rw-r--r--qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js2
2 files changed, 5 insertions, 2 deletions
diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js
index 99b9209d8a..b1399a59cb 100644
--- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js
+++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js
@@ -38,7 +38,10 @@ define(["qpid/common/util",
{
registry.byId("editVirtualHostNode.storePath").set("disabled", true);
}
-
+ if (!( data.effectiveData.role == "MASTER" || data.data.state == "ERRORED" || data.data.state == "STOPPED"))
+ {
+ registry.byId("editVirtualHostNode.permittedNodesList").set("disabled", true);
+ }
var overrideData = [{id: '0', name: 'Majority', selected: '1'}];
if (node.remotereplicationnodes && node.remotereplicationnodes.length>1)
{
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js
index ca619f10f5..1c7cbbe439 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js
@@ -156,7 +156,7 @@ define(["dojo/_base/xhr",
{
try
{
- TypeUI.show({containerNode:that.typeFieldsContainer, parent: that, data: actualData});
+ TypeUI.show({containerNode:that.typeFieldsContainer, parent: that, data: actualData, effectiveData: effectiveData});
that.form.connectChildren();
util.applyMetadataToWidgets(that.allFieldsContainer, "VirtualHostNode", actualData.type);