etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 10303: don't show system vm template for templatefilter == (self and feature) 

status 10303: resolved fixed
This commit is contained in:
Edison Su 2011-06-17 10:48:39 -04:00
parent 8306bf7ee5
commit d3093048f8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/com/cloud/server/ManagementServerImpl.java
View File

@ -1645,7 +1645,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,