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

bug 8613: Added accountId to listUsageRecords API, use active account incase of multiple account with same name 

status 8613: resolved fixed
This commit is contained in:
kishan 2011-02-21 19:38:08 +05:30
parent 60ecb564ea
commit 003787a69a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/com/cloud/user/dao/AccountDao.java
View File

@ -40,5 +40,5 @@ public interface AccountDao extends GenericDao<AccountVO, Long> {
List<AccountVO> findCleanups();
List<AccountVO> findAdminAccountsForDomain(Long domainId);
void markForCleanup(long accountId);
List<AccountVO> listAccounts(String accountName, Long domainId);
List<AccountVO> listAccounts(String accountName, Long domainId, Filter filter);
}

4
server/src/com/cloud/user/dao/AccountDaoImpl.java
View File

@ -132,10 +132,10 @@ public class AccountDaoImpl extends GenericDaoBase<AccountVO, Long> implements A
}
@Override
public List<AccountVO> listAccounts(String accountName, Long domainId) {
public List<AccountVO> listAccounts(String accountName, Long domainId, Filter filter) {
SearchCriteria<AccountVO> sc = AccountNameSearch.create("accountName", accountName);
sc.addAnd("domainId", SearchCriteria.Op.EQ, domainId);
return listIncludingRemovedBy(sc);
return listIncludingRemovedBy(sc, filter);
}
@Override