From 52830fa544a499ceebecef8135a073c3c067bc9e Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Mon, 13 Aug 2012 15:52:59 -0700 Subject: [PATCH] cloudstack 3.0 UI - network page - LB listing - VM listing - VM name - no need to choose between id, displayname, name property in VM object. Always use displayname property in VM object. This also fixes a bug that VM name did not show right after an VM was assigned to a LB rule. --- ui/scripts/network.js | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 5b010e321ab..d4d24d5e09f 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -2616,14 +2616,8 @@ }); $.extend(item, { - _itemName: '_displayName', - _itemData: $.map(lbInstances, function(vm) { - return $.extend(vm, { - _displayName: vm.id == vm.displayname ? - (vm.instancename ? vm.instancename : vm.name) - : vm.displayname - }); - }), + _itemName: 'displayname', + _itemData: lbInstances, _maxLength: { name: 7 },