Skip to content

Commit ca07663

Browse files
authored
Show backup offerings with userDrivenBackupsAllowed=false to all users (#11889)
1 parent 128dbe2 commit ca07663

1 file changed

Lines changed: 0 additions & 8 deletions

File tree

server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -314,11 +314,6 @@ public Pair<List<BackupOffering>, Integer> listBackupOfferings(final ListBackupO
314314
SearchBuilder<BackupOfferingVO> sb = backupOfferingDao.createSearchBuilder();
315315
sb.and("zone_id", sb.entity().getZoneId(), SearchCriteria.Op.EQ);
316316
sb.and("name", sb.entity().getName(), SearchCriteria.Op.EQ);
317-
CallContext ctx = CallContext.current();
318-
final Account caller = ctx.getCallingAccount();
319-
if (Account.Type.NORMAL == caller.getType()) {
320-
sb.and("user_backups_allowed", sb.entity().isUserDrivenBackupAllowed(), SearchCriteria.Op.EQ);
321-
}
322317
final SearchCriteria<BackupOfferingVO> sc = sb.create();
323318

324319
if (zoneId != null) {
@@ -328,9 +323,6 @@ public Pair<List<BackupOffering>, Integer> listBackupOfferings(final ListBackupO
328323
if (keyword != null) {
329324
sc.setParameters("name", "%" + keyword + "%");
330325
}
331-
if (Account.Type.NORMAL == caller.getType()) {
332-
sc.setParameters("user_backups_allowed", true);
333-
}
334326
Pair<List<BackupOfferingVO>, Integer> result = backupOfferingDao.searchAndCount(sc, searchFilter);
335327
return new Pair<>(new ArrayList<>(result.first()), result.second());
336328
}

0 commit comments

Comments
 (0)