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

Fixed problem with displaying direct network dedicated to non-admin accounts.

Browse Source
This commit is contained in:
will 2010-12-31 00:46:34 -08:00
parent 7a66300fc9
commit 18d4c97b55
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/src/com/cloud/network/NetworkManagerImpl.java
View File

@ -1552,13 +1552,17 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
if (type != null) { if (type != null) {
sc.addAnd("guestType", SearchCriteria.Op.EQ, type); sc.addAnd("guestType", SearchCriteria.Op.EQ, type);
} }
if (account.getType() != Account.ACCOUNT_TYPE_ADMIN || (accountName != null && domainId != null)) {
SearchCriteria<NetworkVO> ssc = _networksDao.createSearchCriteria(); sc.addAnd("accountId", SearchCriteria.Op.EQ, accountId);
ssc.addOr("accountId", SearchCriteria.Op.EQ, accountId);
if (accountName == null && domainId == null) {
ssc.addOr("accountId", SearchCriteria.Op.EQ, 1L);
} }
sc.addAnd("accountId", SearchCriteria.Op.SC, ssc);
SearchCriteria<NetworkVO> ssc = _networksDao.createSearchCriteria();
/* ssc.addOr("accountId", SearchCriteria.Op.EQ, accountId);
if (accountName == null && domainId == null) {
ssc.addOr("accountId", SearchCriteria.Op.EQ, 1L);
}
sc.addAnd("accountId", SearchCriteria.Op.SC, ssc);
}*/
List<NetworkVO> networks = _networksDao.search(sc, searchFilter); List<NetworkVO> networks = _networksDao.search(sc, searchFilter);