From a986c6e6260c2bdbc3c7dc9da73135ec8df09e14 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 23 Jan 2012 18:22:52 -0800
Subject: [PATCH] IP Address page - loadBalancing - use network type ("Shared"
 or "Isolated") to decide which parameter to pass to createLoadBalancerRule,
 listLoadBalancerRules API.

---
 ui/scripts/network.js | 53 +++++++------------------------------------
 1 file changed, 8 insertions(+), 45 deletions(-)

diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 75b64c29d22..71d002af433 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -1066,18 +1066,7 @@
               ipRules: {
                 title: 'Configuration',
                 custom: cloudStack.ipRules({
-                  preFilter: function(args) {									  
-										var networkHavingLbService = false;
-										$(args.context.networks[0].service).each(function(){												 
-											if(this.name == "Lb") {
-												networkHavingLbService = true;
-												return false; //break $.each() loop
-											}
-										});
-										args.context.networks[0].networkHavingLbService = networkHavingLbService;
-												
-												
-													
+                  preFilter: function(args) {			
 										var disallowedActions = [];
 										if (args.context.ipAddresses[0].isstaticnat)  
 										  disallowedActions.push("nonStaticNATChart");  //tell ipRules widget to show staticNAT chart instead of non-staticNAT chart.									
@@ -1099,33 +1088,7 @@
 										  disallowedActions.push("portForwarding");
 										if(networkHavingLbService == false) 
 										  disallowedActions.push("loadBalancing");																					
-																					
-										/*	
-									  var disallowedActions = [];
-                    if (args.context.ipAddresses[0].isstaticnat) { //All items filtered means static NAT
-										  disallowedActions.push("firewall");
-											disallowedActions.push("portForwarding");
-											disallowedActions.push("loadBalancing");	
-                     
-											var networkHavingFirewallService = false;
-											$(args.context.networks[0].service).each(function(){												 
-												if(this.name == "Firewall") {
-													networkHavingFirewallService = true;
-													return false; //break $.each() loop
-												}
-											});
-											
-                      if(networkHavingFirewallService == false) {
-                        disallowedActions.push("staticnatFirewall");	
-                      }											
-                    }
-                    if (g_firewallRuleUiEnabled != 'true') {										  
-                      disallowedActions.push("firewall");
-                    }
-										*/
-										
-										
-										
+									
                     return disallowedActions;
                   },
 
@@ -1583,10 +1546,10 @@
                         };
                         var stickyData = $.extend(true, {}, args.data.sticky);
 																			
-												var apiCmd = "createLoadBalancerRule";												
-												if(args.context.networks[0].networkHavingLbService == true) 
+												var apiCmd = "createLoadBalancerRule";		
+												if(args.context.networks[0].type == "Shared") 
 												  apiCmd += "&domainid=" + g_domainid + "&account=" + g_account;
-												else
+												else //args.context.networks[0].type == "Isolated"
 												  apiCmd += "&publicipid=" + args.context.ipAddresses[0].id;
 												
                         $.ajax({
@@ -1738,10 +1701,10 @@
                       }
                     },
                     dataProvider: function(args) {
-										  var apiCmd = "listLoadBalancerRules";										  
-											if(args.context.networks[0].networkHavingLbService == true) 
+										  var apiCmd = "listLoadBalancerRules";												  									
+											if(args.context.networks[0].type == "Shared") 
 												apiCmd += "&domainid=" + g_domainid + "&account=" + g_account;
-											else
+											else //args.context.networks[0].type == "Isolated"
 												apiCmd += "&publicipid=" + args.context.ipAddresses[0].id;
 																				
                       $.ajax({