etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-7847: Can't deploy in project using customer created compute offerings

This commit is contained in:
Wei Zhou 2014-12-05 08:42:22 +01:00
parent 936a17be22
commit 2554cfb140
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/com/cloud/acl/DomainChecker.java
View File

@ -181,7 +181,8 @@ public class DomainChecker extends AdapterBase implements SecurityChecker {
//check if account's domain is a child of zone's domain (Note: This is made consistent with the list command for disk offering)
else if (_accountService.isNormalUser(account.getId())
|| account.getType() == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN
|| _accountService.isDomainAdmin(account.getId())) {
|| _accountService.isDomainAdmin(account.getId())
|| account.getType() == Account.ACCOUNT_TYPE_PROJECT) {
if (account.getDomainId() == dof.getDomainId()) {
return true; //disk offering and account at exact node
} else {
@ -219,7 +220,8 @@ public class DomainChecker extends AdapterBase implements SecurityChecker {
//check if account's domain is a child of zone's domain (Note: This is made consistent with the list command for service offering)
else if (_accountService.isNormalUser(account.getId())
|| account.getType() == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN
|| _accountService.isDomainAdmin(account.getId())) {
|| _accountService.isDomainAdmin(account.getId())
|| account.getType() == Account.ACCOUNT_TYPE_PROJECT) {
if (account.getDomainId() == so.getDomainId()) {
return true; //service offering and account at exact node
} else {