apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Listing projects comprising of only the user's on listAll=true (#4469)

Browse Source 
Co-authored-by: Pearl Dsilva <pearl.dsilva@shapeblue.com>
This commit is contained in:
Pearl Dsilva 2020-11-16 18:07:11 +05:30 committed by GitHub
parent deff74cb93
commit 7f408ec967
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java
View File

@ -116,7 +116,7 @@ public class CreateProjectCmd extends BaseAsyncCreateCmd {
throw new InvalidParameterValueException("Account name and domain id must be specified together"); throw new InvalidParameterValueException("Account name and domain id must be specified together");
} }
if (userId != null && (accountId == null && domainId == null)) { if (userId != null && (accountId == null || domainId == null)) {
throw new InvalidParameterValueException("Account ID and Domain ID must be specified with userID"); throw new InvalidParameterValueException("Account ID and Domain ID must be specified with userID");
} }
if (accountName != null) { if (accountName != null) {

15
server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
View File

@ -1517,15 +1517,19 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
} }
if (accountId != null) { if (accountId != null) {
sb.and("accountId", sb.entity().getAccountId(), SearchCriteria.Op.EQ); if (userId == null) {
sb.and().op("accountId", sb.entity().getAccountId(), SearchCriteria.Op.EQ);
sb.and("userIdNull", sb.entity().getUserId(), Op.NULL);
sb.cp();
} else {
sb.and("accountId", sb.entity().getAccountId(), SearchCriteria.Op.EQ);
}
} }
if (userId != null) { if (userId != null) {
sb.and().op("userId", sb.entity().getUserId(), Op.EQ); sb.and().op("userId", sb.entity().getUserId(), Op.EQ);
sb.or("userIdNull", sb.entity().getUserId(), Op.NULL); sb.or("userIdNull", sb.entity().getUserId(), Op.NULL);
sb.cp(); sb.cp();
} else {
sb.and("userIdNull", sb.entity().getUserId(), Op.NULL);
} }
SearchCriteria<ProjectJoinVO> sc = sb.create(); SearchCriteria<ProjectJoinVO> sc = sb.create();
@ -2585,6 +2589,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
Object keyword = cmd.getKeyword(); Object keyword = cmd.getKeyword();
Long startIndex = cmd.getStartIndex(); Long startIndex = cmd.getStartIndex();
Long pageSize = cmd.getPageSizeVal(); Long pageSize = cmd.getPageSizeVal();
Boolean readonly = cmd.getReadonly();
Filter searchFilter = new Filter(ImageStoreJoinVO.class, "id", Boolean.TRUE, startIndex, pageSize); Filter searchFilter = new Filter(ImageStoreJoinVO.class, "id", Boolean.TRUE, startIndex, pageSize);
@ -2597,6 +2602,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
sb.and("protocol", sb.entity().getProtocol(), SearchCriteria.Op.EQ); sb.and("protocol", sb.entity().getProtocol(), SearchCriteria.Op.EQ);
sb.and("provider", sb.entity().getProviderName(), SearchCriteria.Op.EQ); sb.and("provider", sb.entity().getProviderName(), SearchCriteria.Op.EQ);
sb.and("role", sb.entity().getRole(), SearchCriteria.Op.EQ); sb.and("role", sb.entity().getRole(), SearchCriteria.Op.EQ);
sb.and("readonly", sb.entity().isReadonly(), Op.EQ);
SearchCriteria<ImageStoreJoinVO> sc = sb.create(); SearchCriteria<ImageStoreJoinVO> sc = sb.create();
sc.setParameters("role", DataStoreRole.Image); sc.setParameters("role", DataStoreRole.Image);
@ -2625,6 +2631,9 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
if (protocol != null) { if (protocol != null) {
sc.setParameters("protocol", protocol); sc.setParameters("protocol", protocol);
} }
if (readonly != null) {
sc.setParameters("readonly", readonly);
}
// search Store details by ids // search Store details by ids
Pair<List<ImageStoreJoinVO>, Integer> uniqueStorePair = _imageStoreJoinDao.searchAndCount(sc, searchFilter); Pair<List<ImageStoreJoinVO>, Integer> uniqueStorePair = _imageStoreJoinDao.searchAndCount(sc, searchFilter);