From 240ca7f1f07fee7d16b479ad8d20b547b1c6ab39 Mon Sep 17 00:00:00 2001 From: Edison Su Date: Fri, 17 Jun 2011 10:48:39 -0400 Subject: [PATCH] bug 10303: don't show system vm template for templatefilter == (self and feature) status 10303: resolved fixed --- server/src/com/cloud/server/ManagementServerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 69b46a5d6a5..48a7552af60 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -1643,7 +1643,7 @@ public class ManagementServerImpl implements ManagementServer { // It is account specific if account is admin type and domainId and accountName are not null boolean isAccountSpecific = (account == null || isAdmin(account.getType())) && (accountName != null) && (domainId != null); - boolean showDomr = (templateFilter != TemplateFilter.selfexecutable); + boolean showDomr = ((templateFilter != TemplateFilter.selfexecutable) && (templateFilter != TemplateFilter.featured)); HypervisorType hypervisorType = HypervisorType.getType(cmd.getHypervisor()); return listTemplates(cmd.getId(), cmd.getTemplateName(), cmd.getKeyword(), templateFilter, false, null, accountId, cmd.getPageSizeVal(), cmd.getStartIndex(), cmd.getZoneId(), hypervisorType,