apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 10410:

Browse Source 
same template only shows once in a zone,
and only ready template shows in UI

status 10410: resolved fixed
This commit is contained in:
anthony 2011-06-27 15:49:19 -07:00
parent 615af2971e
commit 7e5d84f2cc
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/src/com/cloud/api/commands/ListIsosCmd.java
View File

@ -126,6 +126,8 @@ public class ListIsosCmd extends BaseListCmd {
} }
public boolean listInReadyState() { public boolean listInReadyState() {
return true;
/*
Account account = UserContext.current().getCaller(); Account account = UserContext.current().getCaller();
// It is account specific if account is admin type and domainId and accountName are not null // It is account specific if account is admin type and domainId and accountName are not null
boolean isAccountSpecific = (account == null || isAdmin(account.getType())) && (getAccountName() != null) && (getDomainId() != null); boolean isAccountSpecific = (account == null || isAdmin(account.getType())) && (getAccountName() != null) && (getDomainId() != null);
@ -134,6 +136,7 @@ public class ListIsosCmd extends BaseListCmd {
boolean onlyReady = (templateFilter == TemplateFilter.featured) || (templateFilter == TemplateFilter.selfexecutable) || (templateFilter == TemplateFilter.sharedexecutable) boolean onlyReady = (templateFilter == TemplateFilter.featured) || (templateFilter == TemplateFilter.selfexecutable) || (templateFilter == TemplateFilter.sharedexecutable)
|| (templateFilter == TemplateFilter.executable && isAccountSpecific) || (templateFilter == TemplateFilter.community); || (templateFilter == TemplateFilter.executable && isAccountSpecific) || (templateFilter == TemplateFilter.community);
return onlyReady; return onlyReady;
*/
} }
///////////////////////////////////////////////////// /////////////////////////////////////////////////////

3
api/src/com/cloud/api/commands/ListTemplatesCmd.java
View File

@ -107,6 +107,8 @@ public class ListTemplatesCmd extends BaseListCmd {
} }
public boolean listInReadyState() { public boolean listInReadyState() {
return true;
/*
Account account = UserContext.current().getCaller(); Account account = UserContext.current().getCaller();
// It is account specific if account is admin type and domainId and accountName are not null // It is account specific if account is admin type and domainId and accountName are not null
boolean isAccountSpecific = (account == null || isAdmin(account.getType())) && (getAccountName() != null) && (getDomainId() != null); boolean isAccountSpecific = (account == null || isAdmin(account.getType())) && (getAccountName() != null) && (getDomainId() != null);
@ -115,6 +117,7 @@ public class ListTemplatesCmd extends BaseListCmd {
boolean onlyReady = (templateFilter == TemplateFilter.featured) || (templateFilter == TemplateFilter.selfexecutable) || (templateFilter == TemplateFilter.sharedexecutable) boolean onlyReady = (templateFilter == TemplateFilter.featured) || (templateFilter == TemplateFilter.selfexecutable) || (templateFilter == TemplateFilter.sharedexecutable)
|| (templateFilter == TemplateFilter.executable && isAccountSpecific) || (templateFilter == TemplateFilter.community); || (templateFilter == TemplateFilter.executable && isAccountSpecific) || (templateFilter == TemplateFilter.community);
return onlyReady; return onlyReady;
*/
} }
///////////////////////////////////////////////////// /////////////////////////////////////////////////////