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

Change removed field annotation in TemplateJoinVO to remove workaround

Browse Source 
for not showing removed entries.
This commit is contained in:
Min Chen 2013-05-08 18:04:02 -07:00
parent 8ad517c028
commit 545d2e4eb6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/com/cloud/api/query/QueryManagerImpl.java
View File

@ -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<List<TemplateJoinVO>, Integer> uniqueTmplPair = _templateJoinDao.searchAndCount(sc, searchFilter);

2
server/src/com/cloud/api/query/vo/TemplateJoinVO.java
View File

@ -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;