From 9deea9bb5522ac903358b2cfd0fe8c83fdecc1ce Mon Sep 17 00:00:00 2001 From: Pranav Saxena Date: Fri, 25 Jan 2013 15:49:29 +0530 Subject: [PATCH] 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 --- ui/scripts/system.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ui/scripts/system.js b/ui/scripts/system.js index bd8d3316103..761900be218 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 /*