incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h...@apache.org
Subject [32/49] git commit: cloudstack UI - regular user in project view - VPC - tier - deploy VM - should pass projectid instead of account parameter to deployVirtualMachine API.
Date Fri, 05 Oct 2012 22:32:45 GMT
cloudstack UI - regular user in project view - VPC - tier - deploy VM - should pass projectid
instead of account parameter to deployVirtualMachine API.


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

Branch: refs/heads/maven-to-rpm
Commit: cd405b410f24440df1840f4c9f0bd7da4be093e3
Parents: 0dc7d65
Author: Jessica Wang <jessica.wang@citrix.com>
Authored: Thu Oct 4 12:52:45 2012 -0700
Committer: Hugo Trippaers <htrippaers@schubergphilis.com>
Committed: Sat Oct 6 00:30:26 2012 +0200

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


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cd405b41/ui/scripts/instanceWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js
index 5e4423f..b35369d 100644
--- a/ui/scripts/instanceWizard.js
+++ b/ui/scripts/instanceWizard.js
@@ -523,7 +523,11 @@
 				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);
+					
+					if(args.context.vpc[0].account != null)
+					  array1.push("&account=" + args.context.vpc[0].account);
+					else if(args.context.vpc[0].projectid != null)
+					  array1.push("&projectid=" + args.context.vpc[0].projectid);
 				}
 			}
 			


Mime
View raw message