From a1099e34c2dca5cdc2b9d6853fd6878fcccf26d3 Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Wed, 21 Mar 2012 09:51:36 -0700
Subject: [PATCH] UI: Better load balancer / multi-edit item naming

Currently, the items listed under the load balancer always use .name as
the field to display for the VM name.

Since 'instancename' is now used for the user-friendly name field,
_itemName metadata attribute can be specified in the rule's data
provider to tell which field should be rendered as the name field in the
list.
---
 ui/scripts/network.js              | 9 +++------
 ui/scripts/ui/widgets/multiEdit.js | 3 ++-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 70146ff2a72..c1278e1957d 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -2078,15 +2078,12 @@
                             });
 
                             $.extend(item, {
-                              _itemData: $.map(lbInstances, function(instance) {
-                                return $.extend(instance, {
-                                  name: instance.instancename
-                                });
-                              }),
+                              _itemName: 'instancename',
+                              _itemData: lbInstances,
                               _maxLength: {
                                 name: 7
                               },
-                              sticky: stickyData
+                              sticky: stickyData,
                             });
                           });
 
diff --git a/ui/scripts/ui/widgets/multiEdit.js b/ui/scripts/ui/widgets/multiEdit.js
index bff47c1f240..b751cfb01a9 100644
--- a/ui/scripts/ui/widgets/multiEdit.js
+++ b/ui/scripts/ui/widgets/multiEdit.js
@@ -514,8 +514,9 @@
 
       itemRow: function(item, itemActions, multiRule, $tbody) {
         var $tr = $('<tr>');
+        var itemName = multiRule._itemName ? item[multiRule._itemName] : item.name;
 
-        $tr.append($('<td></td>').appendTo($tr).html(_s(item.name)));
+        $tr.append($('<td></td>').appendTo($tr).html(_s(itemName)));
 
         if (itemActions) {
           var $itemActions = $('<td>').addClass('actions item-actions');