From 679159ccf40d11fc479ffb057b3607db470ed016 Mon Sep 17 00:00:00 2001 From: nit Date: Tue, 7 Jun 2011 12:22:49 +0530 Subject: [PATCH] bug 9922 : My ISOs shouldnt list Featured ISOs when the user is not the owner of those isos. status 9922: resolved fixed --- server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java b/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java index 8814ee086ef..8b88a6443b1 100755 --- a/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java +++ b/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java @@ -34,6 +34,7 @@ import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import com.cloud.api.BaseCmd; import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.domain.DomainVO; import com.cloud.host.Host; @@ -361,7 +362,9 @@ public class VMTemplateDaoImpl extends GenericDaoBase implem } //for now, defaulting pageSize to a large val if null; may need to revisit post 2.2RC2 - if(isIso && templateZonePairList.size() < (pageSize != null ? pageSize : 500) && templateFilter != TemplateFilter.community){ + if(isIso && templateZonePairList.size() < (pageSize != null ? pageSize : 500) + && templateFilter != TemplateFilter.community + && !(templateFilter == TemplateFilter.self && !BaseCmd.isRootAdmin(account.getType())) ){ //evaluates to true If root admin and filter=self List publicIsos = publicIsoSearch(); for( int i=0; i < publicIsos.size(); i++){ templateZonePairList.add(new Pair(publicIsos.get(i).getId(), null));