incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
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
Date Sun, 27 Jan 2013 13:41:03 GMT
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 <pranav.saxena@citrix.com>
Authored: Fri Jan 25 15:49:29 2013 +0530
Committer: Pranav Saxena <pranav.saxena@citrix.com>
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
 																			/*


Mime
View raw message