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 21E4EDF23 for ; Sun, 27 Jan 2013 13:41:06 +0000 (UTC) Received: (qmail 99534 invoked by uid 500); 27 Jan 2013 13:41:05 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 99462 invoked by uid 500); 27 Jan 2013 13:41:05 -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 98692 invoked by uid 99); 27 Jan 2013 13:41:04 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Jan 2013 13:41:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id F145382606E; Sun, 27 Jan 2013 13:41:03 +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: [4/17] git commit: CLOUDSTACK-1063:SG Enabled Advanced Zone -Add Guest Networks- When user tries to add a guest Network with scope as Account , he should NOT be presented with Offering for shared security group enabled Message-Id: <20130127134103.F145382606E@tyr.zones.apache.org> Date: Sun, 27 Jan 2013 13:41:03 +0000 (UTC) CLOUDSTACK-1063:SG Enabled Advanced Zone -Add Guest Networks- When user tries to add a guest Network with scope as Account , he should NOT be presented with Offering for shared security group enabled Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9deea9bb Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9deea9bb Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9deea9bb Branch: refs/heads/javelin Commit: 9deea9bb5522ac903358b2cfd0fe8c83fdecc1ce Parents: 25c0d84 Author: Pranav Saxena Authored: Fri Jan 25 15:49:29 2013 +0530 Committer: Pranav Saxena Committed: Fri Jan 25 15:49:29 2013 +0530 ---------------------------------------------------------------------- ui/scripts/system.js | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9deea9bb/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index bd8d331..761900b 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -1322,6 +1322,12 @@ networkOfferingObjs = json.listnetworkofferingsresponse.networkoffering; if (networkOfferingObjs != null && networkOfferingObjs.length > 0) { for (var i = 0; i < networkOfferingObjs.length; i++) { + + if(args.scope=="account-specific" && args.context.zones[0].securitygroupsenabled == true) { //BUG - CLOUDSTACK-1063 + var serviceObjArray = networkOfferingObjs[i].name; + if(serviceObjArray == "DefaultSharedNetworkOfferingWithSGService"){ + continue; + } //comment out the following 12 lines because of CS-16718 /*