incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From muralire...@apache.org
Subject [24/100] [abbrv] git commit: CS-16749: cloudstack UI - create network offering - show LB Isolation dropdown when LB is selected and provider is external device regardless of Guest Type(Isolated/Shared)
Date Thu, 06 Dec 2012 08:09:10 GMT
CS-16749: cloudstack UI - create network offering - show LB Isolation dropdown when LB is selected
and provider is external device regardless of Guest Type(Isolated/Shared)


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/792c6c00
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/792c6c00
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/792c6c00

Branch: refs/heads/events-framework
Commit: 792c6c008235a22f763b0c4315094b5876607359
Parents: 442fff1
Author: Jessica Wang <jessica.wang@citrix.com>
Authored: Tue Nov 13 10:37:10 2012 -0800
Committer: Jessica Wang <jessica.wang@citrix.com>
Committed: Tue Nov 13 10:49:11 2012 -0800

----------------------------------------------------------------------
 ui/scripts/configuration.js |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/792c6c00/ui/scripts/configuration.js
----------------------------------------------------------------------
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index 4d1e19d..7d8e51c 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -1268,18 +1268,17 @@
 
                     //show LB InlineMode dropdown only when (1)LB Service is checked (2)Service
Provider is F5 							
 										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()
== 'F5BigIp') && ( args.$form.find('.form-item[rel=\"service.Firewall.isEnabled\"]').find('input[type=checkbox]').is(':checked')
== true) && (args.$form.find('.form-item[rel=\"service.Firewall.provider\"]').find('select').val()
== 'JuniperSRX')  ) {										  
+										   &&(args.$form.find('.form-item[rel=\"service.Lb.provider\"]').find('select').val()
== 'F5BigIp') && ( args.$form.find('.form-item[rel=\"service.Firewall.isEnabled\"]').find('input[type=checkbox]').is(':checked')
== true) && (args.$form.find('.form-item[rel=\"service.Firewall.provider\"]').find('select').val()
== 'JuniperSRX')) {			
 											args.$form.find('.form-item[rel=\"service.Lb.inlineModeDropdown\"]').css('display',
'inline-block');	
 										}
 										else {										  
 											args.$form.find('.form-item[rel=\"service.Lb.inlineModeDropdown\"]').hide();	
 										}												
 										
-										//show LB Isolation dropdown only when (1)LB Service is checked (2)Service Provider
is Netscaler OR F5 (3)Guest IP Type is Isolated 									
+										//show LB Isolation dropdown only when (1)LB Service is checked (2)Service Provider
is Netscaler OR F5 						
 										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.provider\"]').find('select').val()
== 'F5BigIp')) {										  
 											args.$form.find('.form-item[rel=\"service.Lb.lbIsolationDropdown\"]').css('display',
'inline-block');	
 										}
 										else {										  


Mime
View raw message