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 2014/05/05 11:23:09 UTC

svn commit: r1592470 - in /qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management: VirtualHost.js addExchange.js

Author: orudyy
Date: Mon May  5 09:23:09 2014
New Revision: 1592470

URL: http://svn.apache.org/r1592470
Log:
QPID-5744: Fix REST URL in 'Add Exchange UI' of web management console

Modified:
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js?rev=1592470&r1=1592469&r2=1592470&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js Mon May  5 09:23:09 2014
@@ -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",

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js?rev=1592470&r1=1592469&r2=1592470&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js Mon May  5 09:23:09 2014
@@ -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();
                         };



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org