diff options
Diffstat (limited to 'qpid/java/bdbstore')
5 files changed, 8 insertions, 11 deletions
diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js index f1a3887777..076a27a3ae 100644 --- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js +++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js @@ -22,7 +22,7 @@ define(["dijit/registry", "qpid/common/util", "dojo/domReady!"], return { show: function(data) { - util.buildEditUI(data.containerNode, "virtualhost/sizemonitoring/edit.html", "editVirtualHost.", null, null, + util.parseHtmlIntoDiv(data.containerNode, "virtualhost/sizemonitoring/edit.html", function() { registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp); diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js index c94795e31c..ebe6b6822a 100644 --- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js +++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js @@ -22,7 +22,7 @@ define(["qpid/common/util", "qpid/common/metadata", "dijit/registry", "dojo/domR return { show: function(data) { - util.buildEditUI(data.containerNode, "virtualhost/bdb_ha/edit.html", "editVirtualHost.", null, null, + util.parseHtmlIntoDiv(data.containerNode, "virtualhost/bdb_ha/edit.html", function() { registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp); diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/edit.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/edit.js index 20d63378a7..4c70b4a22d 100644 --- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/edit.js +++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/edit.js @@ -22,7 +22,7 @@ define(["qpid/common/util", "dijit/registry", "dojo/domReady!"], return { show: function(data) { - util.buildEditUI(data.containerNode, "virtualhostnode/filebased/edit.html", "editVirtualHostNode.", ["storePath"], data.data, + util.parseHtmlIntoDiv(data.containerNode, "virtualhostnode/filebased/edit.html", function() { registry.byId("editVirtualHostNode.storePath").set("disabled", !(data.data.state == "STOPPED" || data.data.state == "ERRORED")); 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 3a50f98293..e3d69577dc 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 @@ -26,14 +26,11 @@ define(["qpid/common/util", "dojo/domReady!"], function (util, registry, Memory, ObjectStore, win) { - var fields = [ "storePath", "name", "groupName", "address", - "designatedPrimary", "priority", "quorumOverride"]; - return { show: function(data) { var that = this; - util.buildEditUI(data.containerNode, "virtualhostnode/bdb_ha/edit.html", "editVirtualHostNode.", fields, data.data, + util.parseHtmlIntoDiv(data.containerNode, "virtualhostnode/bdb_ha/edit.html", function(){that._postParse(data);}); }, _postParse: function(data) 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 0faae4323e..cfff12dcf2 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 @@ -117,11 +117,11 @@ <div data-dojo-type="dojo/store/Memory" data-dojo-id="nodePriorityStore" data-dojo-props="data: [ {id: '0', name: 'Never'}, - {id: '1', name: 'Default', selected: '1'}, + {id: '1', name: 'Default'}, {id: '2', name: 'High'}, {id: '3', name: 'Highest'} ]"></div> - <input id="editVirtualHostNode.priority" data-dojo-type="dijit/form/FilteringSelect" value="1" + <input id="editVirtualHostNode.priority" data-dojo-type="dijit/form/FilteringSelect" data-dojo-props=" name: 'priority', required: false, @@ -135,9 +135,9 @@ <div class="formLabel-labelCell tableContainer-labelCell">Required minimum number of nodes: </div> <div class="formLabel-controlCell tableContainer-valueCell"> <div data-dojo-type="dojo/store/Memory" data-dojo-id="nodeQuorumOverrideStore" - data-dojo-props="data: [{id: '0', name: 'Majority', selected: '1'}]"></div> + data-dojo-props="data: [{id: '0', name: 'Majority'}]"></div> <input type="text" id="editVirtualHostNode.quorumOverride" - data-dojo-type="dijit/form/FilteringSelect" value="0" + data-dojo-type="dijit/form/FilteringSelect" data-dojo-props=" name: 'quorumOverride', required: false, |