From b4c5f07fca87221b737ac526fbbfbd7b6bde27ba Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Tue, 24 Jan 2012 12:42:30 -0800 Subject: [PATCH] cloudstack 3.0 new UI - IP address page - create load balancer rule - always pass publicIpId regardless network type. --- ui/scripts/network.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 94ed99eb80f..74738404c46 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -1569,9 +1569,9 @@ var stickyData = $.extend(true, {}, args.data.sticky); var apiCmd = "createLoadBalancerRule"; - if(args.context.networks[0].type == "Shared") - apiCmd += "&domainid=" + g_domainid + "&account=" + g_account; - else //args.context.networks[0].type == "Isolated" + //if(args.context.networks[0].type == "Shared") + //apiCmd += "&domainid=" + g_domainid + "&account=" + g_account; + //else //args.context.networks[0].type == "Isolated" apiCmd += "&publicipid=" + args.context.ipAddresses[0].id; $.ajax({ @@ -1725,9 +1725,9 @@ }, dataProvider: function(args) { var apiCmd = "listLoadBalancerRules"; - if(args.context.networks[0].type == "Shared") - apiCmd += "&domainid=" + g_domainid + "&account=" + g_account; - else //args.context.networks[0].type == "Isolated" + //if(args.context.networks[0].type == "Shared") + // apiCmd += "&domainid=" + g_domainid + "&account=" + g_account; + //else //args.context.networks[0].type == "Isolated" apiCmd += "&publicipid=" + args.context.ipAddresses[0].id; $.ajax({