summaryrefslogtreecommitdiff
path: root/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha
diff options
context:
space:
mode:
Diffstat (limited to 'qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha')
-rw-r--r--qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html6
-rw-r--r--qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html41
-rw-r--r--qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/show.html5
3 files changed, 49 insertions, 3 deletions
diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html
index c25bae3419..7f7fb53ed8 100644
--- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html
+++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html
@@ -91,10 +91,10 @@
</fieldset>
</div>
- <input type="hidden" id="addVirtualHostNode.virtualhostBlueprint"
+ <input type="hidden" id="addVirtualHostNode.permittedNodes"
data-dojo-type="dijit/form/ValidationTextBox"
- data-dojo-props="name: 'virtualhostBlueprint'"
- contextvar="true"/>
+ data-dojo-props="name: 'permittedNodes'"
+ />
<input type="hidden" id="addVirtualHostNode.helperAddress"
data-dojo-type="dijit/form/ValidationTextBox"
diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html
index f163390fa2..e040420bdb 100644
--- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html
+++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html
@@ -53,6 +53,47 @@
</div>
</div>
+
+ <div class="formBox clear">
+ <fieldset>
+ <legend>Permitted group nodes</legend>
+ <div class="clear">
+ <div class="formLabel-labelCell tableContainer-labelCell">Permitted addresses*:</div>
+ <div class="formLabel-controlCell tableContainer-valueCell addPermittedNodeList">
+ <select type="text" id="editVirtualHostNode.permittedNodesList"
+ data-dojo-type="dijit/form/MultiSelect"
+ data-dojo-props="
+ multiple: true,
+ name: 'permittedNodeList',
+ readOnly : 'true',
+ excluded: true,
+ title: 'Enter permitted nodes'">
+ </select> <!-- must use closing tag rather than shorthand - dojo bug? -->
+ <input type="hidden" id="editVirtualHostNode.permittedNodes"
+ data-dojo-type="dijit/form/ValidationTextBox"
+ name="permittedNodes"/>
+ </div>
+ <button data-dojo-type="dijit/form/Button" id="editVirtualHostNode.permittedNodeRemove" data-dojo-props="label: '-'" ></button>
+ </div>
+
+ <div class="clear"></div>
+ <div class="clear">
+ <div class="formLabel-labelCell tableContainer-labelCell">Address:</div>
+ <div class="formLabel-controlCell tableContainer-valueCell">
+ <input type="text" id="editVirtualHostNode.permittedNode"
+ data-dojo-type="dijit/form/ValidationTextBox"
+ data-dojo-props="
+ name: 'permittedNode',
+ placeHolder: 'host:port',
+ intermediateChanges: true,
+ title: 'Enter address of node to be permitted into the group',
+ promptMessage: 'Address of node to be permitted into the group'" />
+ </div>
+ <button data-dojo-type="dijit/form/Button" id="editVirtualHostNode.permittedNodeAdd" data-dojo-props="label: '+'"></button>
+ </div>
+ </fieldset>
+ </div>
+
<div class="clear">
<div class="formLabel-labelCell tableContainer-labelCell">Allow this node to operate solo: </div>
<div class="formLabel-controlCell tableContainer-valueCell">
diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/show.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/show.html
index 5a60b75c5c..690440cf7b 100644
--- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/show.html
+++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/show.html
@@ -35,6 +35,10 @@
<div class="formLabel-labelCell">Address:</div>
<div class="address">N/A</div>
</div>
+ <div class="clear">
+ <div class="formLabel-labelCell">Permitted nodes:</div>
+ <div class="permittedNodes multiLineValue"></div>
+ </div>
<div class="clear designatedPrimaryContainer">
<div class="formLabel-labelCell">Allow this node to operate solo:</div>
<div class="designatedPrimary">N/A</div>
@@ -49,6 +53,7 @@
<span class="quorumOverride" >N/A</span>
</div>
</div>
+ <br/>
<div class="clear"></div>
<div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Group nodes'" class="membersGridPanel">
<div class="groupMembers"></div>