diff options
Diffstat (limited to 'qpid/java/broker-plugins/jdbc-provider-bone/src')
4 files changed, 22 insertions, 22 deletions
diff --git a/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/add.js b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/add.js index ccdcf643fb..db3bf8f57b 100644 --- a/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/add.js +++ b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/add.js @@ -32,6 +32,7 @@ define(["dojo/_base/xhr", "dijit/form/FilteringSelect", "dojo/domReady!"], function (xhr, dom, construct, win, registry, parser, array, event, json, string, Memory, FilteringSelect) { + var fieldNames = ["maxConnectionsPerPartition", "minConnectionsPerPartition", "partitionCount"]; return { show: function(poolSpecificDivId, formFieldPrefix, htmlUrl) { var node = dom.byId(poolSpecificDivId); @@ -47,8 +48,16 @@ define(["dojo/_base/xhr", xhr.get({url: htmlUrl, sync: true, load: function(data) { - node.innerHTML = data; - parser.parse(node); + + node.innerHTML = data; + parser.parse(node); + + for ( var i = 0 ; i < fieldNames.length; i++ ) + { + var widgetName = fieldNames[i]; + var widget = registry.byId(formFieldPrefix + widgetName); + widget.set("regExpGen", util.numericOrContextVarRegexp); + } }}); } diff --git a/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/edit.js b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/edit.js index 46345bca58..0179f38d07 100644 --- a/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/edit.js +++ b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/edit.js @@ -24,8 +24,9 @@ define(["dojo/_base/xhr", "dojo/_base/window", "dijit/registry", "dojo/parser", + "qpid/common/util", "dojo/domReady!"], - function (xhr, dom, construct, win, registry, parser) { + function (xhr, dom, construct, win, registry, parser, util) { var fieldNames = ["maxConnectionsPerPartition", "minConnectionsPerPartition", "partitionCount"]; return { show: function(data) { @@ -47,7 +48,9 @@ define(["dojo/_base/xhr", for ( var i = 0 ; i < fieldNames.length; i++ ) { var widgetName = fieldNames[i]; - registry.byId("formAddVirtualHost.qpid.jdbcstore.bonecp." + widgetName).set("value", data.data.context["qpid.jdbcstore.bonecp." + widgetName]); + var widget = registry.byId("formAddVirtualHost.qpid.jdbcstore.bonecp." + widgetName); + widget.set("value", data.data.context["qpid.jdbcstore.bonecp." + widgetName]); + widget.set("regExpGen", util.numericOrContextVarRegexp); } }}); } diff --git a/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html index 3f5c60b110..dc2450a532 100644 --- a/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html +++ b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html @@ -22,36 +22,30 @@ <tr> <td class="tableContainer-labelCell"><strong>Partition Count: </strong></td> <td class="tableContainer-valueCell"> - <input data-dojo-type="dijit/form/NumberSpinner" + <input data-dojo-type="dijit/form/ValidationTextBox" id="formAddVirtualHost.qpid.jdbcstore.bonecp.partitionCount" name="qpid.jdbcstore.bonecp.partitionCount" value="4" - smallDelta="1" - constraints="{min:1,max:1000,places:0}" contextvar="true"/> </td> </tr> <tr> <td class="tableContainer-labelCell"><strong>Minimum connections per Partition:</strong></td> <td class="tableContainer-valueCell"> - <input dojoType="dijit/form/NumberSpinner" + <input dojoType="dijit/form/ValidationTextBox" id="formAddVirtualHost.qpid.jdbcstore.bonecp.minConnectionsPerPartition" name="qpid.jdbcstore.bonecp.minConnectionsPerPartition" value="5" - smallDelta="1" - constraints="{min:1,max:1000,places:0}" contextvar="true"/> </td> </tr> <tr> <td class="tableContainer-labelCell"><strong>Maximum connections per Partition: </strong></td> <td class="tableContainer-valueCell"> - <input dojoType="dijit/form/NumberSpinner" + <input dojoType="dijit/form/ValidationTextBox" id="formAddVirtualHost.qpid.jdbcstore.bonecp.maxConnectionsPerPartition" name="qpid.jdbcstore.bonecp.maxConnectionsPerPartition" value="10" - smallDelta="1" - constraints="{min:1,max:1000,places:0}" contextvar="true"/> </td> </tr> diff --git a/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhostnode/store/pool/bonecp/add.html b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhostnode/store/pool/bonecp/add.html index b4c60b818e..810a232091 100644 --- a/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhostnode/store/pool/bonecp/add.html +++ b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhostnode/store/pool/bonecp/add.html @@ -22,36 +22,30 @@ <tr> <td class="tableContainer-labelCell"><strong>Partition Count: </strong></td> <td class="tableContainer-valueCell"> - <input data-dojo-type="dijit/form/NumberSpinner" + <input data-dojo-type="dijit/form/ValidationTextBox" id="formAddVirtualHostNode.qpid.jdbcstore.bonecp.partitionCount" name="qpid.jdbcstore.bonecp.partitionCount" value="4" - smallDelta="1" - constraints="{min:1,max:1000,places:0}" contextvar="true"/> </td> </tr> <tr> <td class="tableContainer-labelCell"><strong>Minimum connections per Partition:</strong></td> <td class="tableContainer-valueCell"> - <input dojoType="dijit/form/NumberSpinner" + <input dojoType="dijit/form/ValidationTextBox" id="formAddVirtualHostNode.qpid.jdbcstore.bonecp.minConnectionsPerPartition" name="qpid.jdbcstore.bonecp.minConnectionsPerPartition" value="5" - smallDelta="1" - constraints="{min:1,max:1000,places:0}" contextvar="true"/> </td> </tr> <tr> <td class="tableContainer-labelCell"><strong>Maximum connections per Partition: </strong></td> <td class="tableContainer-valueCell"> - <input dojoType="dijit/form/NumberSpinner" + <input dojoType="dijit/form/ValidationTextBox" id="formAddVirtualHostNode.qpid.jdbcstore.bonecp.maxConnectionsPerPartition" name="qpid.jdbcstore.bonecp.maxConnectionsPerPartition" value="10" - smallDelta="1" - constraints="{min:1,max:1000,places:0}" contextvar="true"/> </td> </tr> |