etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-3195: UI > IP Address > detailView > Configuration tab > Port Forwarding > for regular-user, if underlying VM has been destroyed (i.e. listVirtualMachines API returns nothing), compose vm object from limited vm data in port forwarding rule object. So, a vm object (required in widget code) can be passed to widget code. 

(cherry picked from commit 925f30a41b)
This commit is contained in:
Jessica Wang 2014-10-07 16:06:15 -07:00 committed by David Nalley
parent 9714ecbde8
commit 1916bd25d1
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ui/scripts/network.js
View File

@ -4354,14 +4354,25 @@
},
success: function(data) {
loadCurrent++;
var vms = data.listvirtualmachinesresponse.virtualmachine;
//if this VM is destroyed, data.listvirtualmachinesresponse.virtualmachine will be undefined for regular-user (CLOUDSTACK-3195)
if (vms == undefined) {
vms = [{
"id": item.virtualmachineid,
"name": item.virtualmachinename,
"displayname": item.virtualmachinedisplayname
}];
}
$.extend(item, {
_itemData: $.map(data.listvirtualmachinesresponse.virtualmachine, function(vm) {
_itemData: $.map(vms, function(vm) {
return $.extend(vm, {
_displayName: '<p>VM: ' + vm.name + '</p>' + '<p>IP: ' + item.vmguestip + '</p>' // Also display attached IP
});
}),
_context: {
instances: data.listvirtualmachinesresponse.virtualmachine
instances: vms
}
});