Author: orudyy
Date: Fri May 6 16:05:17 2016
New Revision: 1742558
URL: http://svn.apache.org/viewvc?rev=1742558&view=rev
Log:
QPID-7210: Remove confusing suffix 'Promise' from field names in parameter
object passed into dojo.promise.all
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js?rev=1742558&r1=1742557&r2=1742558&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
Fri May 6 16:05:17 2016
@@ -371,9 +371,9 @@ define(["dojo/parser",
var vhostLoadedPromise = this.management.load(this.modelObj,
{excludeInheritedContext: true});
var connectionsPromise = this.management.get({url:
this.management.objectToURL(this.modelObj) + "/getConnections"});
- all({vhostLoadedPromise: vhostLoadedPromise,
connectionsPromise: connectionsPromise}).then(function(results) {
- thisObj.vhostData = results.vhostLoadedPromise[0] || {name:
thisObj.modelObj.name,statistics:{messagesIn:0,bytesIn:0,messagesOut:0,bytesOut:0}};
- thisObj.vhostData.connections = results.connectionsPromise;
+ all({vhostData: vhostLoadedPromise, connections:
connectionsPromise}).then(function(results) {
+ thisObj.vhostData = results.vhostData[0] || {name:
thisObj.modelObj.name,statistics:{messagesIn:0,bytesIn:0,messagesOut:0,bytesOut:0}};
+ thisObj.vhostData.connections = results.connections;
if (callback)
{
callback();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
