Updated Branches: refs/heads/master 9a8089e02 -> cc2dec9fe
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. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/cc2dec9f Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/cc2dec9f Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/cc2dec9f Branch: refs/heads/master Commit: cc2dec9fe1bbc41698783625fd5b8b1fb3ff1afc Parents: 9a8089e Author: Jessica Wang <[email protected]> Authored: Mon Aug 13 15:52:59 2012 -0700 Committer: Jessica Wang <[email protected]> Committed: Mon Aug 13 16:09:06 2012 -0700 ---------------------------------------------------------------------- ui/scripts/network.js | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cc2dec9f/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 1d429bc..b5ee5fe 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -2562,14 +2562,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 },
