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

Merge pull request #1119 from shapeblue/master-instancesjsfix 

[master] ui: Fix undefined check in instances.js, regression from 459d638(fix is already included in the https://github.com/apache/cloudstack/pull/1106 for 4.6 as well)

* pr/1119:
  ui: Fix undefined check in instances.js, regression from 459d638

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2015-11-29 02:54:24 +05:30
parent 39a4a9d196 0bbd9a06a9
commit e4e685b291
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/scripts/instances.js
View File

@ -397,11 +397,13 @@
data: data,
success: function(json) {
var items = json.listvirtualmachinesresponse.virtualmachine;
$.each(items, function(idx, vm) {
if (vm.nic && vm.nic.length > 0 && vm.nic[0].ipaddress) {
items[idx].ipaddress = vm.nic[0].ipaddress;
}
});
if (items) {
$.each(items, function(idx, vm) {
if (vm.nic && vm.nic.length > 0 && vm.nic[0].ipaddress) {
items[idx].ipaddress = vm.nic[0].ipaddress;
}
});
}
args.response.success({
data: items
});