cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From weiz...@apache.org
Subject git commit: updated refs/heads/master to 2554cfb
Date Fri, 05 Dec 2014 07:42:57 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 936a17be2 -> 2554cfb14


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


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

Branch: refs/heads/master
Commit: 2554cfb14056c877f0c9a05823724c34d873d413
Parents: 936a17b
Author: Wei Zhou <w.zhou@tech.leaseweb.com>
Authored: Fri Dec 5 08:42:22 2014 +0100
Committer: Wei Zhou <w.zhou@tech.leaseweb.com>
Committed: Fri Dec 5 08:42:22 2014 +0100

----------------------------------------------------------------------
 server/src/com/cloud/acl/DomainChecker.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2554cfb1/server/src/com/cloud/acl/DomainChecker.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/acl/DomainChecker.java b/server/src/com/cloud/acl/DomainChecker.java
index a5ca9cc..60389ab 100644
--- a/server/src/com/cloud/acl/DomainChecker.java
+++ b/server/src/com/cloud/acl/DomainChecker.java
@@ -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 {


Mime
View raw message