Author: orudyy
Date: Thu Nov 26 14:27:01 2015
New Revision: 1716681
URL: http://svn.apache.org/viewvc?rev=1716681&view=rev
Log:
QPID-6877: Fix setting of validation regular expression on numeric fields
------------------------------------------------------------------------
Merged from trunk with command:
svn merge -c r1716370 https://svn.apache.org/repos/asf/qpid/java/trunk
Modified:
qpid/java/branches/6.0.x/ (props changed)
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js
Propchange: qpid/java/branches/6.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 14:27:01 2015
@@ -9,5 +9,5 @@
/qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368
+/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370
/qpid/trunk/qpid:796646-796653
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js?rev=1716681&r1=1716680&r2=1716681&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js
Thu Nov 26 14:27:01 2015
@@ -66,11 +66,6 @@ define(["dojox/html/entities",
this.form = registry.byId("editBrokerForm");
this.form.on("submit", function(){return false;});
this.context = registry.byId("editBroker.context");
-
- for(var i = 0; i < numericFieldNames.length; i++)
- {
- this[numericFieldNames[i]].set("regExpGen",
util.numericOrContextVarRegexp);
- }
},
show: function(management, brokerData)
{
@@ -142,6 +137,13 @@ define(["dojox/html/entities",
this.initialData = actualData;
util.applyToWidgets(dom.byId("editBroker.allFields"), "Broker",
"broker", actualData, this.management.metadata);
util.setContextData(this.context, management, {type: "broker"},
actualData, effectiveData );
+
+ // Add regexp to the numeric fields
+ for(var i = 0; i < numericFieldNames.length; i++)
+ {
+ registry.byId("editBroker." +
numericFieldNames[i]).set("regExpGen", util.numericOrContextVarRegexp);
+ }
+
this.dialog.startup();
this.dialog.show();
if (!this.resizeEventRegistered)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
