From 545d2e4eb6c13e1931318d66dec9b48bf5a32429 Mon Sep 17 00:00:00 2001 From: Min Chen Date: Wed, 8 May 2013 18:04:02 -0700 Subject: [PATCH] Change removed field annotation in TemplateJoinVO to remove workaround for not showing removed entries. --- server/src/com/cloud/api/query/QueryManagerImpl.java | 4 ++-- server/src/com/cloud/api/query/vo/TemplateJoinVO.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java index 807f2d64f1b..9af2715e84d 100644 --- a/server/src/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/com/cloud/api/query/QueryManagerImpl.java @@ -2681,8 +2681,8 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { sc.addAnd("templateType", SearchCriteria.Op.NEQ, Storage.TemplateType.SYSTEM); } - // don't return removed template - sc.addAnd("removed", SearchCriteria.Op.NULL); + // don't return removed template, this should not be needed since we changed annotation for removed field in TemplateJoinVO. + //sc.addAnd("removed", SearchCriteria.Op.NULL); // search unique templates and find details by Ids Pair, Integer> uniqueTmplPair = _templateJoinDao.searchAndCount(sc, searchFilter); diff --git a/server/src/com/cloud/api/query/vo/TemplateJoinVO.java b/server/src/com/cloud/api/query/vo/TemplateJoinVO.java index 0a6b0f9977c..77ce14afc1a 100644 --- a/server/src/com/cloud/api/query/vo/TemplateJoinVO.java +++ b/server/src/com/cloud/api/query/vo/TemplateJoinVO.java @@ -83,7 +83,7 @@ public class TemplateJoinVO extends BaseViewVO implements ControlledViewEntity { @Column(name="created_on_store") private Date createdOnStore = null; - @Column(name=GenericDao.REMOVED) + @Column(name=GenericDao.REMOVED_COLUMN) @Temporal(TemporalType.TIMESTAMP) private Date removed;