From 6d8cd9f5c07f22cce33f823fd4a932a8bb098edf Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Thu, 29 Nov 2012 10:55:51 -0800 Subject: [PATCH] CLOUDSTACK-564: cloudstack UI - EIP/ELB Basic Zone - Network menu - Guest Network section - network detailView - Add Load Balancer tab - use jobid from assignToLoadBalancerRule instead of createLoadBalancerRule. --- ui/scripts/network.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index a8d4f52147b..133610546e4 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -1321,7 +1321,7 @@ async: true, success: function(data) { var itemData = args.itemData; - var jobID = data.createloadbalancerruleresponse.jobid; + //var jobID = data.createloadbalancerruleresponse.jobid; //CS-16964: use jobid from assignToLoadBalancerRule instead of createLoadBalancerRule $.ajax({ url: createURL('assignToLoadBalancerRule'), @@ -1334,7 +1334,8 @@ dataType: 'json', async: true, success: function(data) { - var lbCreationComplete = false; + var jobID = data.assigntoloadbalancerruleresponse.jobid; //CS-16964: use jobid from assignToLoadBalancerRule instead of createLoadBalancerRule + var lbCreationComplete = false; args.response.success({ _custom: {