From 5e7670070f605eae5157749a339685c02b914a77 Mon Sep 17 00:00:00 2001 From: Fabricio Duarte Date: Mon, 20 Jul 2026 20:16:04 -0300 Subject: [PATCH 1/3] Do not send projectid=-1 on the Quota summary page --- ui/src/config/section/plugin/quota.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ui/src/config/section/plugin/quota.js b/ui/src/config/section/plugin/quota.js index 162fb74f7e75..0c6ab8cb4053 100644 --- a/ui/src/config/section/plugin/quota.js +++ b/ui/src/config/section/plugin/quota.js @@ -30,7 +30,11 @@ export default { title: 'label.quota.summary', icon: 'bars-outlined', permission: ['quotaSummary'], - customParamHandler: (params, query) => { return { ...params, ignoreproject: true } }, + customParamHandler: (params, query) => { + const result = { ...params, ignoreproject: true } + delete result.projectid + return result + }, tabs: [ { name: 'consumption', From e474b7cf5cc298a8a004a9177f96cb1933731ad4 Mon Sep 17 00:00:00 2001 From: Fabricio Duarte Date: Tue, 21 Jul 2026 20:29:41 -0300 Subject: [PATCH 2/3] Revert "Do not send projectid=-1 on the Quota summary page" This reverts commit 5e7670070f605eae5157749a339685c02b914a77. --- ui/src/config/section/plugin/quota.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ui/src/config/section/plugin/quota.js b/ui/src/config/section/plugin/quota.js index 0c6ab8cb4053..162fb74f7e75 100644 --- a/ui/src/config/section/plugin/quota.js +++ b/ui/src/config/section/plugin/quota.js @@ -30,11 +30,7 @@ export default { title: 'label.quota.summary', icon: 'bars-outlined', permission: ['quotaSummary'], - customParamHandler: (params, query) => { - const result = { ...params, ignoreproject: true } - delete result.projectid - return result - }, + customParamHandler: (params, query) => { return { ...params, ignoreproject: true } }, tabs: [ { name: 'consumption', From 958551b2238eefac9f8ccb9cee8a3d00a7b8e6d2 Mon Sep 17 00:00:00 2001 From: Fabricio Duarte Date: Tue, 21 Jul 2026 20:31:47 -0300 Subject: [PATCH 3/3] Turn projectid=-1 into a no-op --- .../apache/cloudstack/api/command/QuotaSummaryCmd.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaSummaryCmd.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaSummaryCmd.java index 870b9b6df6e5..89ab96ebb9f8 100644 --- a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaSummaryCmd.java +++ b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaSummaryCmd.java @@ -116,6 +116,9 @@ public void setListAll(Boolean listAll) { } public Long getProjectId() { + if (projectId == null || projectId == -1L) { + return null; + } return projectId; } @@ -129,9 +132,10 @@ public QuotaAccountStateFilter getAccountStateToShow() { @Override public long getEntityOwnerId() { - if (ObjectUtils.allNull(accountId, accountName, projectId)) { + Long convertedProjectId = getProjectId(); + if (ObjectUtils.allNull(accountId, accountName, convertedProjectId)) { return -1; } - return _accountService.finalizeAccountId(accountId, accountName, domainId, projectId); + return _accountService.finalizeAccountId(accountId, accountName, domainId, convertedProjectId); } }