diff options
| author | Keith Wall <kwall@apache.org> | 2014-08-07 17:05:30 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2014-08-07 17:05:30 +0000 |
| commit | fb4ab9f09df8290c00a33c509cb26fac098ac8e6 (patch) | |
| tree | 23463ee07521d55b88b73930e11716de475d1e36 /qpid/java/broker-plugins/derby-store | |
| parent | 86ff0eaad72c8ec9aecf85a98e382e848c0efccf (diff) | |
| download | qpid-python-fb4ab9f09df8290c00a33c509cb26fac098ac8e6.tar.gz | |
QPID-5972: [Java Broker] Web UI to edit actual attribute values rather than effective values
Work completed by Andrew MacBean <macbean@apache.org> and me.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1616543 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins/derby-store')
3 files changed, 8 insertions, 2 deletions
diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/add.js b/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/add.js index 21d377445d..7b12d10343 100644 --- a/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/add.js +++ b/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/add.js @@ -24,16 +24,20 @@ define(["dojo/_base/xhr", "dojo/json", "dijit/registry", "dojo/text!virtualhost/sizemonitoring/add.html", + "qpid/common/util", "dijit/form/ValidationTextBox", "dijit/form/NumberTextBox", "dojo/domReady!"], - function (xhr, parser, dom, domConstruct, json, registry, template) + function (xhr, parser, dom, domConstruct, json, registry, template, util) { return { show: function (data) { this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode); parser.parse(this.containerNode); + + registry.byId("addVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp); + registry.byId("addVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp); } }; } diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js b/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js index 5438eda926..c71c2c28de 100644 --- a/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js +++ b/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js @@ -24,6 +24,9 @@ define(["qpid/common/util", "dojo/domReady!"], show: function(data) { util.buildEditUI(data.containerNode, "virtualhost/sizemonitoring/edit.html", "editVirtualHost.", fieldNames, data.data); + + registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp); + registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp); } }; } diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/show.js b/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/show.js index 22f6e4fa37..ffbe4bfacd 100644 --- a/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/show.js +++ b/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/show.js @@ -31,7 +31,6 @@ define(["qpid/common/util", "dojo/domReady!"], DerbyNode.prototype.update=function(data) { - this.parent.editNodeButton.set("disabled", !(data.state == "STOPPED" || data.state == "ERRORED")); util.updateUI(data, fields, this); }; |