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

Conflicts:

	ui/scripts/system.js
---
 ui/scripts/system.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 9ab0a3984fe..e304951d147 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -6488,7 +6488,6 @@
                   id: 'vSwitches',
                   fields: {
                     vsmdeviceid: { label: 'label.name' },
-                    zonename: { label: 'label.zone' },
                     vsmdevicestate: { label: 'label.state' }
                   },
                   detailView: {
@@ -6632,9 +6631,7 @@
                         var item = json.listcisconexusvsmscmdresponse.cisconexusvsm;  
                         args.response.success({
                           actionFilter: nexusActionfilter,
-                          data: $.extend(item, {
-                            zonename: args.context.clusters[0].zonename
-                          })
+                          data: item
                         });
                       },
                       error: function(json) {