From 08def8999dd2b7c11a5aa59534021372d928f109 Mon Sep 17 00:00:00 2001 From: Andrew MacBean Date: Fri, 12 Sep 2014 10:27:04 +0000 Subject: QPID-6092: [Java Broker] Editing permitted node list to be allowed when VHN is master or in STOPPED/ERRORED state. UI (2/2) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1624490 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js | 5 ++++- .../main/java/resources/js/qpid/management/editVirtualHostNode.js | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'qpid/java') 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); -- cgit v1.2.1