From 09e0fa09629d9b904d27285228d0b7c79262f6c9 Mon Sep 17 00:00:00 2001 From: Nitin Mehta Date: Thu, 19 Jan 2012 15:27:57 +0530 Subject: [PATCH] Bug 13027: ListIsos shouldnt display isos that are not dowloaded when asked for only ready templates. Status 13027: resolved fixed Reviewed-By: Kishan --- api/src/com/cloud/api/commands/ListIsosCmd.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/src/com/cloud/api/commands/ListIsosCmd.java b/api/src/com/cloud/api/commands/ListIsosCmd.java index d28923bfb0b..c43c4db865e 100755 --- a/api/src/com/cloud/api/commands/ListIsosCmd.java +++ b/api/src/com/cloud/api/commands/ListIsosCmd.java @@ -127,11 +127,11 @@ public class ListIsosCmd extends BaseListCmd { public boolean listInReadyState() { Account account = UserContext.current().getCaller(); // 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); // Show only those that are downloaded. TemplateFilter templateFilter = TemplateFilter.valueOf(getIsoFilter()); boolean onlyReady = (templateFilter == TemplateFilter.featured) || (templateFilter == TemplateFilter.selfexecutable) || (templateFilter == TemplateFilter.sharedexecutable) - || (templateFilter == TemplateFilter.executable && isAccountSpecific) || (templateFilter == TemplateFilter.community); + || (templateFilter == TemplateFilter.executable) || (templateFilter == TemplateFilter.community); return onlyReady; }