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

quota: allow locked accounts to be credited

This commit is contained in:
Abhinandan Prateek 2015-07-29 11:25:52 +05:30
parent 7a6b536d4b
commit e4125a2999
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaCreditsCmd.java
View File

@ -87,7 +87,7 @@ public class QuotaCreditsCmd extends BaseCmd {
@Override
public void execute() {
Long accountId = _accountService.finalyzeAccountId(accountName, domainId, null, true);
Long accountId = _accountService.getActiveAccountByName(accountName, domainId).getAccountId();
if (accountId == null) {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "The account does not exists or has been removed/disabled");
}

4
plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java
View File

@ -109,9 +109,7 @@ public class QuotaResponseBuilderImpl implements QuotaResponseBuilder {
boolean consecutive=true;
for (Iterator<QuotaBalanceVO> it = quotaBalance.iterator(); it.hasNext();) {
QuotaBalanceVO entry = it.next();
// s_logger.info("Date=" + entry.getUpdatedOn().toGMTString() +
// " balance=" + entry.getCreditBalance() + " credit=" +
// entry.getCreditsId());
s_logger.info("Date=" + entry.getUpdatedOn().toGMTString() + " balance=" + entry.getCreditBalance() + " credit=" + entry.getCreditsId());
if (entry.getCreditsId() > 0) {
if (consecutive){
lastCredits = lastCredits.add(entry.getCreditBalance());