From 07fd2cab6d42f0e7097c42ff0ff76b532a9455c6 Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Fri, 18 May 2012 12:09:14 -0700
Subject: [PATCH] CS-14980: Fix blank PF/LB instance name label

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.
---
 ui/scripts/network.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 31c7bd04397..1661a8f8421 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -2252,7 +2252,9 @@
                               _itemName: '_displayName',
                               _itemData: $.map(lbInstances, function(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: {
@@ -2440,7 +2442,9 @@
                                 $.extend(item, {
                                   _itemData: $.map(data.listvirtualmachinesresponse.virtualmachine, function(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: {