You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2012/11/29 19:56:24 UTC
git commit: 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.
Updated Branches:
refs/heads/master e4a517319 -> 6d8cd9f5c
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.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/6d8cd9f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6d8cd9f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6d8cd9f5
Branch: refs/heads/master
Commit: 6d8cd9f5c07f22cce33f823fd4a932a8bb098edf
Parents: e4a5173
Author: Jessica Wang <je...@citrix.com>
Authored: Thu Nov 29 10:55:51 2012 -0800
Committer: Jessica Wang <je...@citrix.com>
Committed: Thu Nov 29 10:55:51 2012 -0800
----------------------------------------------------------------------
ui/scripts/network.js | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6d8cd9f5/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index a8d4f52..1336105 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: {