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 2012/10/04 21:54:08 UTC

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

Updated Branches:
  refs/heads/master 939e060e2 -> 10a5bdab4


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/10a5bdab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/10a5bdab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/10a5bdab

Branch: refs/heads/master
Commit: 10a5bdab49da4e8d6cb968acebcc76587970c971
Parents: 939e060
Author: Jessica Wang <je...@citrix.com>
Authored: Thu Oct 4 12:52:45 2012 -0700
Committer: Jessica Wang <je...@citrix.com>
Committed: Thu Oct 4 12:53:54 2012 -0700

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


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/10a5bdab/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);
 				}
 			}