summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js2
-rw-r--r--qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js8
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();
};