Author: orudyy
Date: Tue Dec 1 12:54:48 2015
New Revision: 1717415
URL: http://svn.apache.org/viewvc?rev=1717415&view=rev
Log:
QPID-6922: [Web Management UI] Fix defect causing error during edit of
authentication provider
------------------------------------------------------------------------
Merged from trunk with command:
svn merge -c r1717401 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/addAuthenticationProvider.js
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/PreferencesProviderForm.js
Propchange: qpid/java/branches/6.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 1 12:54:48 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,1716370,1716374,1716432,1716444-1716445,1716455,1716461,1716474,1716489,1716497,1716515,1716555,1716602,1716606-1716610,1716619,1716636,1717269,1717299
+/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370,1716374,1716432,1716444-1716445,1716455,1716461,1716474,1716489,1716497,1716515,1716555,1716602,1716606-1716610,1716619,1716636,1717269,1717299,1717401
/qpid/trunk/qpid:796646-796653
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js?rev=1717415&r1=1717414&r2=1717415&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
Tue Dec 1 12:54:48 2015
@@ -61,7 +61,9 @@ define(["dojo/dom",
var that = this;
this.authenticationProviderName =
registry.byId("addAuthenticationProvider.name");
this.authenticationProviderName.set("regExpGen",
util.nameOrContextVarRegexp);
- this.authenticationProviderName.on("change",
function(newValue){that.preferencesProviderForm.preferencesProviderNameWidget.set("value",newValue);});
+ this.authenticationProviderName.on("change",
function(newValue){
+
that.preferencesProviderForm.setPreferencesProviderName(newValue);
+ });
this.dialog = registry.byId("addAuthenticationProvider");
this.addButton =
registry.byId("addAuthenticationProvider.addButton");
@@ -110,7 +112,7 @@ define(["dojo/dom",
else
{
that.preferencesProviderForm.reset();
-
that.preferencesProviderForm.preferencesProviderNameWidget.set("value",
actualData.name);
+
that.preferencesProviderForm.setPreferencesProviderName(actualData.name);
}
that.authenticationProviderName.set("value", actualData.name);
that._show();
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/PreferencesProviderForm.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/PreferencesProviderForm.js?rev=1717415&r1=1717414&r2=1717415&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/PreferencesProviderForm.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/PreferencesProviderForm.js
Tue Dec 1 12:54:48 2015
@@ -95,6 +95,13 @@ function (util, declare, array, domConst
{
return this.preferencesProviderNameWidget.get("value");
},
+ setPreferencesProviderName: function(name)
+ {
+ if (!(this.data && this.data.name))
+ {
+ this.preferencesProviderNameWidget.set("value", name);
+ }
+ },
setMetadata: function(metadata)
{
this.metadata = metadata;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
