cloudstack UI - regular user in project view - VPC - tier - deploy VM - should pass projectid instead of account parameter to deployVirtualMachine API.

Jessica Wang · Jessica Wang · commit 10a5bdab49da · 2012-10-04T12:53:54.000-07:00
diff --git 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);
 				}
 			}
 			

Original file line number	Diff line number	Diff line change
`@@ -523,7 +523,11 @@`
`523`	`523`	`if(args.context.networks != null) { //from VPC tier`
`524`	`524`	`array1.push("&networkIds=" + args.context.networks[0].id);`
`525`	`525`	`array1.push("&domainid=" + args.context.vpc[0].domainid);`
`526`		`- array1.push("&account=" + args.context.vpc[0].account);`
	`526`	`+`
	`527`	`+ if(args.context.vpc[0].account != null)`
	`528`	`+ array1.push("&account=" + args.context.vpc[0].account);`
	`529`	`+ else if(args.context.vpc[0].projectid != null)`
	`530`	`+ array1.push("&projectid=" + args.context.vpc[0].projectid);`
`527`	`531`	`}`
`528`	`532`	`}`
`529`	`533`