From 9a3067fb87ee8bc1de66a02632e352e5e46e07ce Mon Sep 17 00:00:00 2001
From: Min Chen <min.chen@citrix.com>
Date: Tue, 2 Jul 2013 15:47:31 -0700
Subject: [PATCH] CLOUDSTACK-3314: templates downloaded to S3 should show up in
 listTemplates when zoneId is provided.

---
 server/src/com/cloud/api/query/QueryManagerImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java
index 18091aa5c3d..90a3b6f3bb3 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -2877,7 +2877,8 @@ public class QueryManagerImpl extends ManagerBase implements QueryService {
 
             if (zoneId != null) {
                 SearchCriteria<TemplateJoinVO> zoneSc = _templateJoinDao.createSearchCriteria();
-                zoneSc.addAnd("dataCenterId", SearchCriteria.Op.EQ, zoneId);
+                zoneSc.addOr("dataCenterId", SearchCriteria.Op.EQ, zoneId);
+                zoneSc.addOr("dataStoreScope", SearchCriteria.Op.EQ, ScopeType.REGION);
                 // handle the case where xs-tools.iso and vmware-tools.iso do not have data_center information in template_view
                 SearchCriteria<TemplateJoinVO> isoPerhostSc = _templateJoinDao.createSearchCriteria();
                 isoPerhostSc.addAnd("format", SearchCriteria.Op.EQ, ImageFormat.ISO);