Author: orudyy
Date: Thu Nov 26 14:34:52 2015
New Revision: 1716693
URL: http://svn.apache.org/viewvc?rev=1716693&view=rev
Log:
QPID-6911: Fix UI after change of type value for the Broker
------------------------------------------------------------------------
Merged from trunk with command:
svn merge -c r1716555 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:34:52 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
+/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
/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=1716693&r1=1716692&r2=1716693&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:34:52 2015
@@ -72,7 +72,7 @@ define(["dojox/html/entities",
this.management = management;
var that=this;
this.dialog.set("title", "Edit Broker - " +
entities.encode(String(brokerData.name)));
- var typeMetaData = management.metadata.getMetaData("Broker",
"broker");
+ var typeMetaData = management.metadata.getMetaData("Broker",
"Broker");
var encrypters =
typeMetaData.attributes.confidentialConfigurationEncryptionProvider.validValues;
var encrypterTypesData = [];
encrypterTypesData.push({id: undefined, name: "None"});
@@ -135,7 +135,7 @@ define(["dojox/html/entities",
_show:function(actualData, effectiveData)
{
this.initialData = actualData;
- util.applyToWidgets(dom.byId("editBroker.allFields"), "Broker",
"broker", actualData, this.management.metadata);
+ 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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
