Skip to content

Commit b04d744

Browse files
committed
Show backup offerings with userDrivenBackupsAllowed=false to all users
1 parent 8b9f5fd commit b04d744

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

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

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

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

0 commit comments

Comments
 (0)