From bdb44c685069444a66ed4b4d99f030c2db0b579f Mon Sep 17 00:00:00 2001 From: alena Date: Tue, 2 Aug 2011 09:42:24 -0700 Subject: [PATCH] bug 10916: don't return removed entries when do listDiskOfferings by regular user status 10916: resolved fixed --- server/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/server/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java b/server/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java index e96f7dd2a78..9724e346d39 100644 --- a/server/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java +++ b/server/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java @@ -58,6 +58,7 @@ public class DiskOfferingDaoImpl extends GenericDaoBase im PublicDiskOfferingSearch = createSearchBuilder(); PublicDiskOfferingSearch.and("domainId", PublicDiskOfferingSearch.entity().getDomainId(), SearchCriteria.Op.NULL); PublicDiskOfferingSearch.and("system", PublicDiskOfferingSearch.entity().getSystemUse(), SearchCriteria.Op.EQ); + PublicDiskOfferingSearch.and("removed", PublicDiskOfferingSearch.entity().getRemoved(), SearchCriteria.Op.NULL); PublicDiskOfferingSearch.done(); UniqueNameSearch = createSearchBuilder();