incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: CS-15803: cloudstack 3.0 UI - VPC - fix a bug that root-admin failed to create a VM in a tier that belonged to regular-user or domain-admin.
Date Thu, 09 Aug 2012 21:53:43 GMT
Updated Branches:
  refs/heads/vpc ed28accdf -> 3b8494131


CS-15803: cloudstack 3.0 UI - VPC - fix a bug that root-admin failed to create a VM in a tier
that belonged to regular-user or domain-admin.


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/3b849413
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/3b849413
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/3b849413

Branch: refs/heads/vpc
Commit: 3b8494131fe2714d454dc71987dd63a5e5925e1a
Parents: ed28acc
Author: Jessica Wang <jessica.wang@citrix.com>
Authored: Thu Aug 9 14:50:56 2012 -0700
Committer: Jessica Wang <jessica.wang@citrix.com>
Committed: Thu Aug 9 14:53:06 2012 -0700

----------------------------------------------------------------------
 ui/scripts/instanceWizard.js |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3b849413/ui/scripts/instanceWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js
index 8265d0c..f2830a8 100644
--- a/ui/scripts/instanceWizard.js
+++ b/ui/scripts/instanceWizard.js
@@ -520,9 +520,12 @@
         if(checkedSecurityGroupIdArray.length > 0)
           array1.push("&securitygroupids=" + checkedSecurityGroupIdArray.join(","));
       }
-      else if (step5ContainerType == 'nothing-to-select') {		
-				if(args.context.networks != null) //from VPC tier
+      else if (step5ContainerType == 'nothing-to-select') {	  
+				if(args.context.networks != null) { //from VPC tier
 				  array1.push("&networkIds=" + args.context.networks[0].id);
+					array1.push("&domainid=" + args.context.vpc[0].domainid);
+					array1.push("&account=" + args.context.vpc[0].account);
+				}
 			}
 			
       var displayname = args.data.displayname;


Mime
View raw message