|
44 | 44 |
|
45 | 45 | import com.cloud.domain.Domain; |
46 | 46 | import com.cloud.exception.PermissionDeniedException; |
| 47 | +import com.cloud.projects.ProjectVO; |
| 48 | +import com.cloud.projects.dao.ProjectDao; |
47 | 49 | import com.cloud.user.User; |
48 | 50 | import com.cloud.user.UserVO; |
49 | 51 | import com.cloud.utils.DateUtil; |
@@ -139,6 +141,8 @@ public class QuotaResponseBuilderImpl implements QuotaResponseBuilder { |
139 | 141 | @Inject |
140 | 142 | private AccountDao _accountDao; |
141 | 143 | @Inject |
| 144 | + private ProjectDao projectDao; |
| 145 | + @Inject |
142 | 146 | private QuotaAccountDao quotaAccountDao; |
143 | 147 | @Inject |
144 | 148 | private DomainDao domainDao; |
@@ -188,7 +192,13 @@ public QuotaTariffResponse createQuotaTariffResponse(QuotaTariffVO tariff, boole |
188 | 192 | public Pair<List<QuotaSummaryResponse>, Integer> createQuotaSummaryResponse(QuotaSummaryCmd cmd) { |
189 | 193 | Account caller = CallContext.current().getCallingAccount(); |
190 | 194 |
|
191 | | - if (cmd.getAccountId() != null && !cmd.isListAll() && accountTypesThatCanListAllQuotaSummaries.contains(caller.getType())) { |
| 195 | + if (cmd.getProjectId() != null && !cmd.isListAll() && accountTypesThatCanListAllQuotaSummaries.contains(caller.getType())) { |
| 196 | + ProjectVO projectVO = projectDao.findById(cmd.getProjectId()); |
| 197 | + Long projectAccountId = projectVO.getProjectAccountId(); |
| 198 | + return getQuotaSummaryResponse(projectAccountId, null, null, null, cmd); |
| 199 | + } |
| 200 | + |
| 201 | + else if (cmd.getAccountId() != null && !cmd.isListAll() && accountTypesThatCanListAllQuotaSummaries.contains(caller.getType())) { |
192 | 202 | return getQuotaSummaryResponse(cmd.getAccountId(), null, null, null, cmd); |
193 | 203 | } |
194 | 204 |
|
|
0 commit comments