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

CS-13874 

If no 'custom' instance name is specified for a VM, use the
'instancename' field instead of 'displayname' for the label in PF/LB
UI.
This commit is contained in:
Brian Federle 2012-05-14 13:53:26 -07:00
parent 8a08e379f1
commit ecbe959a23
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ui/scripts/network.js
View File

@ -2115,8 +2115,12 @@
});
$.extend(item, {
_itemName: 'displayname',
_itemData: lbInstances,
_itemName: '_displayName',
_itemData: $.map(lbInstances, function(vm) {
return $.extend(vm, {
_displayName: vm.id == vm.displayname ? vm.instancename : vm.displayname
});
}),
_maxLength: {
name: 7
},
@ -2286,8 +2290,8 @@
$(portForwardingData).each(function() {
var item = this;
item._itemName = 'displayname';
item._itemName = '_displayName';
$.ajax({
url: createURL('listVirtualMachines'),
@ -2300,7 +2304,11 @@
success: function(data) {
loadCurrent++;
$.extend(item, {
_itemData: data.listvirtualmachinesresponse.virtualmachine,
_itemData: $.map(data.listvirtualmachinesresponse.virtualmachine, function(vm) {
return $.extend(vm, {
_displayName: vm.id == vm.displayname ? vm.instancename : vm.displayname
});
}),
_context: {
instances: data.listvirtualmachinesresponse.virtualmachine
}