From b04d74448fdfce09d152bcc2edc51c18a0f0863a Mon Sep 17 00:00:00 2001 From: Abhisar Sinha <63767682+abh1sar@users.noreply.github.com> Date: Wed, 22 Oct 2025 17:45:45 +0530 Subject: [PATCH] Show backup offerings with userDrivenBackupsAllowed=false to all users --- .../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 54a809fc8597..1da6d1f13232 100644 --- a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java +++ b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java @@ -313,11 +313,6 @@ public Pair, Integer> listBackupOfferings(final ListBackupO SearchBuilder 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 sc = sb.create(); if (zoneId != null) { @@ -327,9 +322,6 @@ public Pair, Integer> listBackupOfferings(final ListBackupO if (keyword != null) { sc.setParameters("name", "%" + keyword + "%"); } - if (Account.Type.NORMAL == caller.getType()) { - sc.setParameters("user_backups_allowed", true); - } Pair, Integer> result = backupOfferingDao.searchAndCount(sc, searchFilter); return new Pair<>(new ArrayList<>(result.first()), result.second()); }