You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2015/11/26 15:22:21 UTC
svn commit: r1716672 - in /qpid/java/branches/6.0.x: ./
broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js
Author: orudyy
Date: Thu Nov 26 14:22:21 2015
New Revision: 1716672
URL: http://svn.apache.org/viewvc?rev=1716672&view=rev
Log:
QPID-6877: [Java Broker] Set default value correctly for 'Config Encryption' widget in Edit Broker dialog
------------------------------------------------------------------------
Merged from trunk with command:
svn merge -c r1716194 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:22:21 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
+/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194
/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=1716672&r1=1716671&r2=1716672&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:22:21 2015
@@ -45,7 +45,6 @@ define(["dojox/html/entities",
"dojo/domReady!"],
function (entities, array, event, lang, win, dom, domConstruct, registry, parser, json, query, Memory, ObjectStore, util, template)
{
- var fields = [ "name", "statisticsReportingPeriod", "statisticsReportingResetEnabled", "confidentialConfigurationEncryptionProvider", "connection.sessionCountLimit", "connection.heartBeatDelay"];
var numericFieldNames = ["statisticsReportingPeriod", "connection.sessionCountLimit", "connection.heartBeatDelay"];
var brokerEditor =
@@ -64,11 +63,6 @@ define(["dojox/html/entities",
this.cancelButton = registry.byId("editBroker.cancelButton");
this.cancelButton.on("click", function(e){that._cancel(e);});
this.saveButton.on("click", function(e){that._save(e);});
- for(var i = 0; i < fields.length; i++)
- {
- var fieldName = fields[i];
- this[fieldName] = registry.byId("editBroker." + fieldName);
- }
this.form = registry.byId("editBrokerForm");
this.form.on("submit", function(){return false;});
this.context = registry.byId("editBroker.context");
@@ -86,7 +80,7 @@ define(["dojox/html/entities",
var typeMetaData = management.metadata.getMetaData("Broker", "broker");
var encrypters = typeMetaData.attributes.confidentialConfigurationEncryptionProvider.validValues;
var encrypterTypesData = [];
- encrypterTypesData.push({id: "", name: "None"});
+ encrypterTypesData.push({id: undefined, name: "None"});
array.forEach(encrypters,
function(item)
{
@@ -97,7 +91,7 @@ define(["dojox/html/entities",
var encrytperTypesStore = new Memory({ data: encrypterTypesData });
var encrypterControl = registry.byId("editBroker.confidentialConfigurationEncryptionProvider");
encrypterControl.set("store", encrytperTypesStore);
- encrypterControl.set("value", "NONE");
+ encrypterControl.set("value", undefined);
management.load( {type:"broker"}, { actuals: true }).then(
function(data)
@@ -146,23 +140,7 @@ define(["dojox/html/entities",
_show:function(actualData, effectiveData)
{
this.initialData = actualData;
-
- for(var i = 0; i < fields.length; i++)
- {
- var fieldName = fields[i];
- var widget = this[fieldName];
- widget.reset();
-
- if (widget instanceof dijit.form.CheckBox)
- {
- widget.set("checked", actualData[fieldName]);
- }
- else
- {
- widget.set("value", actualData[fieldName]);
- }
- }
- util.applyMetadataToWidgets(dom.byId("editBroker.allFields"), "Broker", "broker", this.management.metadata);
+ util.applyToWidgets(dom.byId("editBroker.allFields"), "Broker", "broker", actualData, this.management.metadata);
util.setContextData(this.context, management, {type: "broker"}, actualData, effectiveData );
this.dialog.startup();
this.dialog.show();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org