From b558aba6143345fdbdaa2d5da42ee4bd081e4d4b Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 23 May 2012 10:38:32 -0700
Subject: [PATCH 1/2] CS-14206: cloudstack 3.0 UI - create network offering -
 show LB Isolation dropdown when LB service is checked and LB service provider
 is Netscaler or F5, regardless of Guest Type. (reviewed-by: Brian)

---
 ui/scripts/configuration.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index 92c0d49b8e2..22bf47f861e 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -1126,7 +1126,7 @@
 										if((args.$form.find('.form-item[rel=\"service.Lb.isEnabled\"]').find('input[type=checkbox]').is(':checked') == true)
 										   &&(args.$form.find('.form-item[rel=\"service.Lb.provider\"]').find('select').val() == 'Netscaler' 
 											    || args.$form.find('.form-item[rel=\"service.Lb.provider\"]').find('select').val() == 'F5BigIp')
-											 &&(args.$form.find('.form-item[rel=\"guestIpType\"]').find('select').val() == 'Isolated')) {										  
+											 ) {										  
 											args.$form.find('.form-item[rel=\"service.Lb.lbIsolationDropdown\"]').css('display', 'inline-block');	
 										}
 										else {										  

From c86b8ac069685c0a8f278d6d0d1ca62f2318664e 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 2/2] vSwitch UI fixes

reviewed-by: brian
---
 ui/scripts/system.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index bcefbdb4748..1b5fe2add9a 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');
@@ -6224,11 +6228,10 @@
                   array1.push("&username=" + todb(args.data.vCenterUsername));
                   array1.push("&password=" + todb(args.data.vCenterPassword));
 
-                  if (args.data.enableNexusVswitch) {
                     array1.push('&vsmipaddress=' + args.data.vsmipaddress);
                     array1.push('&vsmusername=' + args.data.vsmusername);
                     array1.push('&vsmpassword=' + args.data.vsmpassword);
-                  }
+                  
 
                   var hostname = args.data.vCenterHost;
                   var dcName = args.data.vCenterDatacenter;