You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2013/01/22 01:03:23 UTC

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.

Updated Branches:
  refs/heads/master ff5477d1f -> 635ac34d0


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/master
Commit: 635ac34d0665a614c67d35dbd2b51b43e9da075d
Parents: ff5477d
Author: Jessica Wang <je...@citrix.com>
Authored: Mon Jan 21 16:02:39 2013 -0800
Committer: Jessica Wang <je...@citrix.com>
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)';																		
+									}
+								}
+							}
+            }						
           }
         });