apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-17 11:04:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

CS-14980: Fix blank PF/LB instance name label

Browse Source 
Show VM ID if .displayname and .instancename are not present, as is
the case with KVM-type virtual machines that don't have a custom name.
This commit is contained in:
Brian Federle 2012-05-18 12:09:14 -07:00
parent 318fdbfa89
commit 07fd2cab6d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/scripts/network.js
View File

@ -2252,7 +2252,9 @@
_itemName: '_displayName', _itemName: '_displayName',
_itemData: $.map(lbInstances, function(vm) { _itemData: $.map(lbInstances, function(vm) {
return $.extend(vm, { return $.extend(vm, {
_displayName: vm.id == vm.displayname ? vm.instancename : vm.displayname _displayName: vm.id == vm.displayname ?
(vm.instancename ? vm.instancename : vm.name)
: vm.displayname
}); });
}), }),
_maxLength: { _maxLength: {
@ -2440,7 +2442,9 @@
$.extend(item, { $.extend(item, {
_itemData: $.map(data.listvirtualmachinesresponse.virtualmachine, function(vm) { _itemData: $.map(data.listvirtualmachinesresponse.virtualmachine, function(vm) {
return $.extend(vm, { return $.extend(vm, {
_displayName: vm.id == vm.displayname ? vm.instancename : vm.displayname _displayName: vm.id == vm.displayname ?
(vm.instancename ? vm.instancename : vm.name)
: vm.displayname
}); });
}), }),
_context: { _context: {