From 661fa30bcfb218444bb21c5814f582564a0df5d2 Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Wed, 23 May 2012 10:45:46 -0700
Subject: [PATCH] vSwitch UI fixes

commit 531ebe165de441fdf8e8bb86c76056504cf3aadb
Author: Brian Federle <brian.federle@citrix.com>
Date:   Wed May 23 10:27:51 2012 -0700

    Fix vSwitch password field

reviewed-by: brian

commit e51a0bd5e198483704d6d7f2dc4cb4c74e7c9167
Author: Pranav Saxena <pranav.saxena@citrix.com>
Date:   Wed May 23 19:40:13 2012 +0530

    CS-9919: Changes to integrate UI changes for nexus feature

reviewed-by: brian

Conflicts:

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

diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index febc219e915..e736e4540d2 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -6111,12 +6111,16 @@
 
                       args.$select.bind("change", function(event) {
                         var $form = $(this).closest('form');
-                        var $vsmFields = $.merge(
-                          $form.find('.form-item[rel=vsmipaddress]'),
-                          $form.find('.form-item[rel=vsmusername]'),
-                          $form.find('.form-item[rel=vsmpassword]')  
-                        );
-                        
+                        var $vsmFields = $form.find('.form-item').filter(function() {
+                          var vsmFields = [
+                            'vsmipaddress',
+                            'vsmusername',
+                            'vsmpassword'
+                          ];
+
+                          return $.inArray($(this).attr('rel'), vsmFields) > -1;
+                        });
+
                         if ($(this).val() == "VMware") {
                           //$('li[input_sub_group="external"]', $dialogAddCluster).show();
                           $form.find('.form-item[rel=vCenterHost]').css('display', 'inline-block');
@@ -6223,7 +6227,6 @@
                 if(args.data.hypervisor == "VMware") {
                   array1.push("&username=" + todb(args.data.vCenterUsername));
                   array1.push("&password=" + todb(args.data.vCenterPassword));
-
                   array1.push('&vsmipaddress=' + args.data.vsmipaddress);
                   array1.push('&vsmusername=' + args.data.vsmusername);
                   array1.push('&vsmpassword=' + args.data.vsmpassword);