From 2a08eaa95788671559bf05753ff7b9fcf8ac54a0 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Tue, 24 Jan 2012 15:36:01 -0800 Subject: [PATCH] network page - Load Balancer tab - Create Load Balancer Rule - pass domainId/account instead of publicIpId to createLoadBalancerRule. --- ui/scripts/network.js | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 843d1f67184..b6326185780 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -445,7 +445,7 @@ var hiddenTabs = []; if(showLbTab == false) - hiddenTabs.push("loadBalancing"); + hiddenTabs.push("loadBalancer"); return hiddenTabs; }, @@ -659,10 +659,10 @@ var apiCmd = "createLoadBalancerRule"; //if(args.context.networks[0].type == "Shared") - //apiCmd += "&domainid=" + g_domainid + "&account=" + g_account; + apiCmd += "&domainid=" + g_domainid + "&account=" + g_account; //else //args.context.networks[0].type == "Isolated" - apiCmd += "&account=" + args.context.users[0].account; - apiCmd += '&domainid=' + args.context.users[0].domainid; + //apiCmd += "&account=" + args.context.users[0].account; + //apiCmd += '&domainid=' + args.context.users[0].domainid; $.ajax({ url: createURL(apiCmd), @@ -908,20 +908,6 @@ ) } } - - - , - //Brian, please duplicate loadBalancing from another place to here - loadBalancing: { - title: 'Load balancer', - dataProvider: function(args) { - args.response.success({ - data: {} - }); - } - } - - } } }