QPID-7606: [Java Broker, WMC] Fix setting of alternate binding on UI for editing queues and exchanges
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/c18ef920 Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/c18ef920 Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/c18ef920 Branch: refs/heads/master Commit: c18ef920d675aa785bcc748c5de833c65311c293 Parents: 7efa77d Author: Alex Rudyy <oru...@apache.org> Authored: Tue Sep 5 15:54:03 2017 +0100 Committer: Alex Rudyy <oru...@apache.org> Committed: Wed Sep 6 07:24:48 2017 +0100 ---------------------------------------------------------------------- .../resources/js/qpid/management/addExchange.js | 18 +++++++------ .../resources/js/qpid/management/addQueue.js | 27 +++++++++++--------- 2 files changed, 25 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c18ef920/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js ---------------------------------------------------------------------- diff --git a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js index 1337401..fd82b32 100644 --- a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js +++ b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js @@ -118,6 +118,7 @@ define(["dojo/dom", if (effectiveData) { + this.effectiveData = effectiveData; var afterLoad = lang.hitch(this, function (data) { var actualData = data.actual; @@ -153,20 +154,21 @@ define(["dojo/dom", { this.alternateBindingLoadPromise.then(lang.hitch(this, function () { + util.applyToWidgets(this.form.domNode, + "Exchange", + this.initialData.type || "direct", + this.initialData, + this.management.metadata, + this.effectiveData); + var alternate = this.initialData.alternateBinding; if (alternate && alternate.destination) { this.alternateBinding.set("value", alternate.destination); } - })); - util.applyToWidgets(this.form.domNode, - "Exchange", - this.initialData.type || "direct", - this.initialData, - this.management.metadata); - - registry.byId("addExchange").show(); + registry.byId("addExchange").show(); + })); }, _submit : function (e) http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c18ef920/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js ---------------------------------------------------------------------- diff --git a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js index 50ef327..bc52ac0 100644 --- a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js +++ b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js @@ -215,24 +215,27 @@ define(["dojo/dom", { this.alternateBindingLoadPromise.then(lang.hitch(this, function () { + var validValues = this.management.metadata.getMetaData("Queue", + this.initialData.type).attributes.overflowPolicy.validValues; + var validValueStore = util.makeTypeStore(validValues); + this.overflowPolicyWidget.set("store", validValueStore); + + util.applyToWidgets(this.form.domNode, + "Queue", + this.initialData.type, + this.initialData, + this.management.metadata, + this.effectiveData + ); + var alternate = this.initialData.alternateBinding; if (alternate && alternate.destination) { this.alternateBinding.set("value", alternate.destination); } - })); - util.applyToWidgets(this.form.domNode, - "Queue", - this.initialData.type, - this.initialData, - this.management.metadata); - - var validValues = this.management.metadata.getMetaData("Queue", - this.initialData.type).attributes.overflowPolicy.validValues; - var validValueStore = util.makeTypeStore(validValues); - this.overflowPolicyWidget.set("store", validValueStore); - registry.byId("addQueue").show(); + registry.byId("addQueue").show(); + })); } }; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
