diff options
| author | Alex Rudyy <orudyy@apache.org> | 2014-05-05 09:23:09 +0000 |
|---|---|---|
| committer | Alex Rudyy <orudyy@apache.org> | 2014-05-05 09:23:09 +0000 |
| commit | 3e90e9dcc11e5deeb6e412ce127473ca34674353 (patch) | |
| tree | 8d29f5ab2715db0c47059274fdf5494bb3a53d07 /qpid/java | |
| parent | 255979cc180383f3adc212e5d06756d236e011e6 (diff) | |
| download | qpid-python-3e90e9dcc11e5deeb6e412ce127473ca34674353.tar.gz | |
QPID-5744: Fix REST URL in 'Add Exchange UI' of web management console
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1592470 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
2 files changed, 6 insertions, 4 deletions
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js index d745154faf..999638d0c7 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js @@ -78,7 +78,7 @@ define(["dojo/_base/xhr", ); var addExchangeButton = query(".addExchangeButton", contentPane.containerNode)[0]; - connect.connect(registry.byNode(addExchangeButton), "onClick", function(evt){ addExchange.show(that.name) }); + connect.connect(registry.byNode(addExchangeButton), "onClick", function(evt){ addExchange.show({virtualhost:that.name,virtualhostnode:that.modelObj.parent.name}) }); var deleteExchangeButton = query(".deleteExchangeButton", contentPane.containerNode)[0]; connect.connect(registry.byNode(deleteExchangeButton), "onClick", diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js index cd882db32e..65c9a9f6f6 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js @@ -109,7 +109,8 @@ define(["dojo/_base/xhr", var newExchange = convertToExchange(theForm.getValues()); var that = this; - xhr.put({url: "api/latest/exchange/"+encodeURIComponent(addExchange.vhost) + + xhr.put({url: "api/latest/exchange/"+encodeURIComponent(addExchange.vhostnode) + + "/"+encodeURIComponent(addExchange.vhost) + "/"+encodeURIComponent(newExchange.name), sync: true, handleAs: "json", headers: { "Content-Type": "application/json"}, putData: json.toJson(newExchange), @@ -136,8 +137,9 @@ define(["dojo/_base/xhr", }); }}); - addExchange.show = function(vhost) { - addExchange.vhost = vhost; + addExchange.show = function(data) { + addExchange.vhost = data.virtualhost; + addExchange.vhostnode = data.virtualhostnode; registry.byId("formAddExchange").reset(); registry.byId("addExchange").show(); }; |