Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7A77010480 for ; Fri, 20 Sep 2013 00:12:20 +0000 (UTC) Received: (qmail 35699 invoked by uid 500); 20 Sep 2013 00:12:20 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 35680 invoked by uid 500); 20 Sep 2013 00:12:20 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 35673 invoked by uid 99); 20 Sep 2013 00:12:20 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Sep 2013 00:12:20 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id F12978A3606; Fri, 20 Sep 2013 00:12:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jessicawang@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.2-forward to 24e898b Date: Fri, 20 Sep 2013 00:12:19 +0000 (UTC) Updated Branches: refs/heads/4.2-forward e81a2b4ff -> 24e898b4c CLOUDSTACK-4714: EIP/ELB Basic Zone > EIP/ELB Basic Zone > Network page > Add Load Balancer tab > add AutoScale rule > spinning wheel is hanging forever with JS error "args.context.ipAddresses is undefined". Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/24e898b4 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/24e898b4 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/24e898b4 Branch: refs/heads/4.2-forward Commit: 24e898b4cddf1a8ebc3b4886526d94921ade869b Parents: e81a2b4 Author: Jessica Wang Authored: Thu Sep 19 17:10:43 2013 -0700 Committer: Jessica Wang Committed: Thu Sep 19 17:10:43 2013 -0700 ---------------------------------------------------------------------- ui/scripts/autoscaler.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/24e898b4/ui/scripts/autoscaler.js ---------------------------------------------------------------------- diff --git a/ui/scripts/autoscaler.js b/ui/scripts/autoscaler.js index 6fabf68..ab1b459 100644 --- a/ui/scripts/autoscaler.js +++ b/ui/scripts/autoscaler.js @@ -1116,7 +1116,7 @@ var apiCmd, apiCmdRes; if (!('multiRules' in args.context)) { //from a new LB var data = { - zoneid: args.context.ipAddresses[0].zoneid, //args.context.networks[0] doesn't have zoneid property, so use args.context.ipAddresses[0] instead + zoneid: args.context.networks[0].zoneid, //get zoneid from args.context.networks[0] instead of args.context.ipAddresses[0] because args.context.ipAddresses is null when adding AutoScale rule from Add Load Balancer tab in Network page serviceofferingid: args.data.serviceOfferingId, templateid: args.data.templateNames, destroyvmgraceperiod: args.data.destroyVMgracePeriod,