diff options
Diffstat (limited to 'qpid/java/broker-plugins/management-http')
5 files changed, 22 insertions, 42 deletions
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHostNode.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHostNode.html index cee18f7185..59597845a2 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHostNode.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHostNode.html @@ -19,31 +19,34 @@ <div class="dijitHidden"> <div data-dojo-type="dijit/Dialog" data-dojo-props="title:'Edit Virtual Host'" id="editVirtualHostNodeDialog"> <form id="editVirtualHostNodeForm" method="post" data-dojo-type="dijit/form/Form"> - <div id="editVirtualHostNode.contentPane"> - <div class="editNoteBanner">NOTE: All changes will only take effect after Virtual Host Node restart.</div> - <div class="clear"> - <div class="formLabel-labelCell tableContainer-labelCell">Name*:</div> - <div class="formLabel-controlCell tableContainer-valueCell"> - <input type="text" id="editVirtualHostNode.name" - data-dojo-type="dijit/form/ValidationTextBox" - data-dojo-props=" + <div id="editVirtualHostNode.allFields"> + <div id="editVirtualHostNode.contentPane"> + <div class="editNoteBanner">NOTE: All changes will only take effect after Virtual Host Node restart.</div> + <div class="clear"> + <div class="formLabel-labelCell tableContainer-labelCell">Name*:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> + <input type="text" id="editVirtualHostNode.name" + data-dojo-type="dijit/form/ValidationTextBox" + data-dojo-props=" name: 'name', placeHolder: 'name', required: true, missingMessage: 'Name must be supplied', disabled: true, title: 'Enter virtual host name'" /> - </div> - </div> + </div> + </div> - <div id="editVirtualHostNode.typeFields"></div> + <div id="editVirtualHostNode.typeFields"></div> - <div class="clear"></div> + <div class="clear"></div> - <div data-dojo-type="dijit/TitlePane" data-dojo-props="title: 'Context variables', open: false"> - <div id="editVirtualHostNode.context" ></div> + <div data-dojo-type="dijit/TitlePane" data-dojo-props="title: 'Context variables', open: false"> + <div id="editVirtualHostNode.context" ></div> + </div> + </div> </div> - </div> + <div class="dijitDialogPaneActionBar qpidDialogPaneActionBar"> <button data-dojo-type="dijit/form/Button" id="editVirtualHostNode.saveButton" data-dojo-props="label: 'Save'">Save</button> <button data-dojo-type="dijit/form/Button" id="editVirtualHostNode.cancelButton" data-dojo-props="label: 'Cancel'" ></button> diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js index 43f4d1dc84..3938b74762 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js @@ -565,29 +565,6 @@ define(["dojo/_base/xhr", } - util.buildEditUI = function(containerNode, htmlTemplateLocation, fieldNamePrefix, fieldNames, data, postParseCallback) - { - this.parseHtmlIntoDiv(containerNode, htmlTemplateLocation, function() - { - - if (fieldNames) - { - for(var i = 0; i < fieldNames.length; i++) - { - var fieldName = fieldNames[i]; - var widget = registry.byId(fieldNamePrefix + fieldName); - widget.set("value", data[fieldName]); - } - } - - if (postParseCallback && typeof postParseCallback == "function") - { - postParseCallback(); - } - - }); - } - util.updateUI = function(data, fieldNames, obj) { for(var i=0; i<fieldNames.length;i++) 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 8638164d9f..b5a7edab2d 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 @@ -57,6 +57,7 @@ define(["dojo/_base/xhr", _postParse: function() { var that=this; + this.allFieldsContainer = dom.byId("editVirtualHostNode.allFields"); this.typeFieldsContainer = dom.byId("editVirtualHostNode.typeFields"); this.dialog = registry.byId("editVirtualHostNodeDialog"); this.saveButton = registry.byId("editVirtualHostNode.saveButton"); @@ -164,7 +165,7 @@ define(["dojo/_base/xhr", TypeUI.show({containerNode:that.typeFieldsContainer, parent: that, data: actualData, effectiveData: effectiveData}); that.form.connectChildren(); - util.applyMetadataToWidgets(that.allFieldsContainer, "VirtualHostNode", actualData.type); + util.applyToWidgets(that.allFieldsContainer, "VirtualHostNode", actualData.type, actualData); } catch(e) { diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/edit.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/edit.js index 9672426384..3a305fb016 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/edit.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/edit.js @@ -20,11 +20,10 @@ define(["dijit/registry", "qpid/common/util", "dojo/domReady!"], function (registry, util) { - var fieldNames = ["storeUnderfullSize", "storeOverfullSize"]; return { show: function(data) { - util.buildEditUI(data.containerNode, "virtualhost/providedstore/edit.html", "editVirtualHost.", fieldNames, data.data, + util.parseHtmlIntoDiv(data.containerNode, "virtualhost/providedstore/edit.html", function() { registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp); diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostnode/json/edit.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostnode/json/edit.js index 20d63378a7..4c70b4a22d 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostnode/json/edit.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostnode/json/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")); |