ListAllIncludingProjectResources if ADMIN && listAll

GabrielBrascher · GabrielBrascher · commit 9217e9763ec6 · 2020-08-19T03:39:03.000-03:00
diff --git a/server/src/main/java/com/cloud/user/AccountManagerImpl.java b/server/src/main/java/com/cloud/user/AccountManagerImpl.java
@@ -2689,6 +2689,8 @@ public void buildACLSearchParameters(Account caller, Long id, String accountName
                     permittedAccounts.add(project.getProjectAccountId());
                 }
             }
+        } else if (caller.getType() == Account.ACCOUNT_TYPE_ADMIN && listAll) {
+            domainIdRecursiveListProject.third(ListProjectResourcesCriteria.ListAllIncludingProjectResources);
         } else {
             if (id == null) {
                 domainIdRecursiveListProject.third(Project.ListProjectResourcesCriteria.SkipProjectResources);

Original file line number	Diff line number	Diff line change
`@@ -2689,6 +2689,8 @@ public void buildACLSearchParameters(Account caller, Long id, String accountName`
`2689`	`2689`	`permittedAccounts.add(project.getProjectAccountId());`
`2690`	`2690`	`}`
`2691`	`2691`	`}`
	`2692`	`+ } else if (caller.getType() == Account.ACCOUNT_TYPE_ADMIN && listAll) {`
	`2693`	`+ domainIdRecursiveListProject.third(ListProjectResourcesCriteria.ListAllIncludingProjectResources);`
`2692`	`2694`	`} else {`
`2693`	`2695`	`if (id == null) {`
`2694`	`2696`	`domainIdRecursiveListProject.third(Project.ListProjectResourcesCriteria.SkipProjectResources);`