From bec24d533d1db1eb8a7e6abdf5d6bbf77cef8f00 Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Mon, 27 Jun 2011 15:46:44 -0700
Subject: [PATCH] bug 10410: same template only shows once per zone

status 10410: resolved fixed
---
 api/src/com/cloud/api/commands/ListIsosCmd.java      | 5 ++++-
 api/src/com/cloud/api/commands/ListTemplatesCmd.java | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/api/src/com/cloud/api/commands/ListIsosCmd.java b/api/src/com/cloud/api/commands/ListIsosCmd.java
index c2765008620..0b3cd18af64 100755
--- a/api/src/com/cloud/api/commands/ListIsosCmd.java
+++ b/api/src/com/cloud/api/commands/ListIsosCmd.java
@@ -126,6 +126,8 @@ public class ListIsosCmd extends BaseListCmd {
     }
     
     public boolean listInReadyState() {
+        return true;
+        /*
         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);
@@ -134,6 +136,7 @@ public class ListIsosCmd extends BaseListCmd {
         boolean onlyReady = (templateFilter == TemplateFilter.featured) || (templateFilter == TemplateFilter.selfexecutable) || (templateFilter == TemplateFilter.sharedexecutable)
         || (templateFilter == TemplateFilter.executable && isAccountSpecific) || (templateFilter == TemplateFilter.community);
         return onlyReady;
+        */
     }
 
     /////////////////////////////////////////////////////
@@ -171,7 +174,7 @@ public class ListIsosCmd extends BaseListCmd {
             isAdmin = true;            
         }
 
-       ListResponse<TemplateResponse> response = _responseGenerator.createIsoResponse(isoZonePairSet, isAdmin, account, bootable, listInReadyState());
+       ListResponse<TemplateResponse> response = _responseGenerator.createIsoResponse(isoZonePairSet, isAdmin, account, bootable, true);
         response.setResponseName(getCommandName());
         this.setResponseObject(response);
     }
diff --git a/api/src/com/cloud/api/commands/ListTemplatesCmd.java b/api/src/com/cloud/api/commands/ListTemplatesCmd.java
index 6f58acd829f..bf5110d826d 100755
--- a/api/src/com/cloud/api/commands/ListTemplatesCmd.java
+++ b/api/src/com/cloud/api/commands/ListTemplatesCmd.java
@@ -107,6 +107,8 @@ public class ListTemplatesCmd extends BaseListCmd {
     }
     
     public boolean listInReadyState() {
+        return true;
+        /*
         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);
@@ -115,6 +117,7 @@ public class ListTemplatesCmd extends BaseListCmd {
         boolean onlyReady = (templateFilter == TemplateFilter.featured) || (templateFilter == TemplateFilter.selfexecutable) || (templateFilter == TemplateFilter.sharedexecutable)
         || (templateFilter == TemplateFilter.executable && isAccountSpecific) || (templateFilter == TemplateFilter.community);
         return onlyReady;
+        */
     }
 
     /////////////////////////////////////////////////////
@@ -144,7 +147,7 @@ public class ListTemplatesCmd extends BaseListCmd {
         List<TemplateResponse> templateResponses = new ArrayList<TemplateResponse>();
 
         for (Pair<Long, Long> template : templateZonePairSet) {
-            _responseGenerator.createTemplateResponse(templateResponses, template, isAdmin, account, listInReadyState());
+            _responseGenerator.createTemplateResponse(templateResponses, template, isAdmin, account, true);
         }
 
         response.setResponses(templateResponses);