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 34916D54F for ; Fri, 25 Jan 2013 03:32:10 +0000 (UTC) Received: (qmail 2825 invoked by uid 500); 25 Jan 2013 03:32:09 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 2464 invoked by uid 500); 25 Jan 2013 03:32:08 -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 96425 invoked by uid 99); 25 Jan 2013 03:31:53 -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, 25 Jan 2013 03:31:53 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id EE5DF8251B6; Fri, 25 Jan 2013 03:31:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [8/50] [abbrv] git commit: CLOUDSTACK-537: cloudstack UI - Advanced SG-enabled zone - VM Wizard - step5 - select network step - desc field - append '(sg)' if a network includes security group service. Message-Id: <20130125033152.EE5DF8251B6@tyr.zones.apache.org> Date: Fri, 25 Jan 2013 03:31:52 +0000 (UTC) CLOUDSTACK-537: cloudstack UI - Advanced SG-enabled zone - VM Wizard - step5 - select network step - desc field - append '(sg)' if a network includes security group service. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/635ac34d Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/635ac34d Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/635ac34d Branch: refs/heads/javelin Commit: 635ac34d0665a614c67d35dbd2b51b43e9da075d Parents: ff5477d Author: Jessica Wang Authored: Mon Jan 21 16:02:39 2013 -0800 Committer: Jessica Wang Committed: Mon Jan 21 16:02:39 2013 -0800 ---------------------------------------------------------------------- ui/scripts/instanceWizard.js | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/635ac34d/ui/scripts/instanceWizard.js ---------------------------------------------------------------------- diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js index 47908c2..8ebee62 100644 --- a/ui/scripts/instanceWizard.js +++ b/ui/scripts/instanceWizard.js @@ -365,6 +365,18 @@ async: false, success: function(json) { networkObjs = json.listnetworksresponse.network ? json.listnetworksresponse.network : []; + + if(networkObjs.length > 0) { + for(var i = 0; i < networkObjs.length; i++) { + var networkObj = networkObjs[i]; + var serviceObjArray = networkObj.service; + for(var k = 0; k < serviceObjArray.length; k++) { + if(serviceObjArray[k].name == "SecurityGroup") { + networkObjs[i].type = networkObjs[i].type + ' (sg)'; + } + } + } + } } });