From c3b6f2dc3906ac32c27cf474bbd3022fe6f41f94 Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Wed, 30 May 2012 09:42:40 -0700
Subject: [PATCH] CS-15126: Removing the zone field for now

Conflicts:

	ui/scripts/system.js
---
 ui/scripts/system.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 318e8bd82b7..908bd9da6b6 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -6490,8 +6490,7 @@
                   id: 'vSwitches',
                   fields: {
                     vsmdeviceid: { label: 'label.name' },
-                    zonename: { label: 'label.zone' },
-                    vsmdevicestate: { label: 'label.status' }
+                    vsmdevicestate: { label: 'label.state' }
                   },
                   detailView: {
                     actions: {
@@ -6638,11 +6637,8 @@
                         var item = json.listcisconexusvsmscmdresponse.cisconexusvsm;
                         args.response.success({
                           actionFilter: nexusActionfilter,
-                          data: $.map(item, function(item) {
-                            return $.extend(item, {
-                              zonename: args.context.clusters[0].zonename
-                            });
-                          })
+                          data: item
+                         
                         });
                       },
                       error: function(json) {