This is an automated email from the ASF dual-hosted git repository.
bstoyanov pushed a commit to branch 4.22
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.22 by this push:
new ca076637183 Show backup offerings with userDrivenBackupsAllowed=false
to all users (#11889)
ca076637183 is described below
commit ca076637183dc827afc052c755b489c9c985160a
Author: Abhisar Sinha <[email protected]>
AuthorDate: Tue Jan 27 13:23:17 2026 +0530
Show backup offerings with userDrivenBackupsAllowed=false to all users
(#11889)
---
.../main/java/org/apache/cloudstack/backup/BackupManagerImpl.java | 8 --------
1 file changed, 8 deletions(-)
diff --git
a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
index ef3ba917de7..c0955e40d2c 100644
--- a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
@@ -314,11 +314,6 @@ public class BackupManagerImpl extends ManagerBase
implements BackupManager {
SearchBuilder<BackupOfferingVO> sb =
backupOfferingDao.createSearchBuilder();
sb.and("zone_id", sb.entity().getZoneId(), SearchCriteria.Op.EQ);
sb.and("name", sb.entity().getName(), SearchCriteria.Op.EQ);
- CallContext ctx = CallContext.current();
- final Account caller = ctx.getCallingAccount();
- if (Account.Type.NORMAL == caller.getType()) {
- sb.and("user_backups_allowed",
sb.entity().isUserDrivenBackupAllowed(), SearchCriteria.Op.EQ);
- }
final SearchCriteria<BackupOfferingVO> sc = sb.create();
if (zoneId != null) {
@@ -328,9 +323,6 @@ public class BackupManagerImpl extends ManagerBase
implements BackupManager {
if (keyword != null) {
sc.setParameters("name", "%" + keyword + "%");
}
- if (Account.Type.NORMAL == caller.getType()) {
- sc.setParameters("user_backups_allowed", true);
- }
Pair<List<BackupOfferingVO>, Integer> result =
backupOfferingDao.searchAndCount(sc, searchFilter);
return new Pair<>(new ArrayList<>(result.first()), result.second());
}