From cloudstack-commits-return-8872-apmail-incubator-cloudstack-commits-archive=incubator.apache.org@incubator.apache.org Mon Jan 21 23:52:56 2013 Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EA327D04D for ; Mon, 21 Jan 2013 23:52:55 +0000 (UTC) Received: (qmail 87154 invoked by uid 500); 21 Jan 2013 23:52:51 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 87112 invoked by uid 500); 21 Jan 2013 23:52:51 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 86976 invoked by uid 99); 21 Jan 2013 23:52:51 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Jan 2013 23:52:51 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 12760822A1B; Mon, 21 Jan 2013 23:52:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jessicawang@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: CLOUDSTACK-537: cloudstack UI - Advanced SG-enabled zone - VM Wizard - step 5 - specify canusefordeploy parameter in listNetworks API when populating network list. Message-Id: <20130121235251.12760822A1B@tyr.zones.apache.org> Date: Mon, 21 Jan 2013 23:52:51 +0000 (UTC) Updated Branches: refs/heads/master 6e40c3362 -> bfdec24de CLOUDSTACK-537: cloudstack UI - Advanced SG-enabled zone - VM Wizard - step 5 - specify canusefordeploy parameter in listNetworks API when populating network list. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/bfdec24d Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/bfdec24d Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/bfdec24d Branch: refs/heads/master Commit: bfdec24de44b4aca47fdf78a22f710157a775701 Parents: 6e40c33 Author: Jessica Wang Authored: Mon Jan 21 15:52:10 2013 -0800 Committer: Jessica Wang Committed: Mon Jan 21 15:52:10 2013 -0800 ---------------------------------------------------------------------- ui/scripts/instanceWizard.js | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bfdec24d/ui/scripts/instanceWizard.js ---------------------------------------------------------------------- diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js index f3fe6a5..8d064d8 100644 --- a/ui/scripts/instanceWizard.js +++ b/ui/scripts/instanceWizard.js @@ -329,7 +329,8 @@ if(step5ContainerType == 'select-network' || step5ContainerType == 'select-advanced-sg') { var defaultNetworkArray = [], optionalNetworkArray = []; var networkData = { - zoneId: args.currentData.zoneid + zoneId: args.currentData.zoneid, + canusefordeploy: true }; // step5ContainerType of Advanced SG-enabled zone is 'select-security-group', so won't come into this block