archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't show deleted comments for tag data either

Browse Source
pull/14/head
Sam Bosley 12 years ago
parent 38c4417758
commit 27ddeb6e23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

6
astrid/src/com/todoroo/astrid/service/TagDataService.java
Unescape Escape View File

@ -140,13 +140,13 @@ public class TagDataService {
private static Query queryForTagData(TagData tagData, Criterion extraCriterion, String userTableAlias, Property<?>[] activityProperties, Property<?>[] userProperties) { private static Query queryForTagData(TagData tagData, Criterion extraCriterion, String userTableAlias, Property<?>[] activityProperties, Property<?>[] userProperties) {
Criterion criteria; Criterion criteria;
if (tagData == null) if (tagData == null)
criteria = Criterion.all; criteria = UserActivity.DELETED_AT.eq(0);
else else
criteria = Criterion.or( criteria = Criterion.and(UserActivity.DELETED_AT.eq(0), Criterion.or(
Criterion.and(UserActivity.ACTION.eq(UserActivity.ACTION_TAG_COMMENT), UserActivity.TARGET_ID.eq(tagData.getUuid())), Criterion.and(UserActivity.ACTION.eq(UserActivity.ACTION_TAG_COMMENT), UserActivity.TARGET_ID.eq(tagData.getUuid())),
Criterion.and(UserActivity.ACTION.eq(UserActivity.ACTION_TASK_COMMENT), Criterion.and(UserActivity.ACTION.eq(UserActivity.ACTION_TASK_COMMENT),
UserActivity.TARGET_ID.in(Query.select(TaskToTagMetadata.TASK_UUID) UserActivity.TARGET_ID.in(Query.select(TaskToTagMetadata.TASK_UUID)
.from(Metadata.TABLE).where(Criterion.and(MetadataCriteria.withKey(TaskToTagMetadata.KEY), TaskToTagMetadata.TAG_UUID.eq(tagData.getUuid())))))); .from(Metadata.TABLE).where(Criterion.and(MetadataCriteria.withKey(TaskToTagMetadata.KEY), TaskToTagMetadata.TAG_UUID.eq(tagData.getUuid())))))));
if (extraCriterion != null) if (extraCriterion != null)
criteria = Criterion.and(criteria, extraCriterion); criteria = Criterion.and(criteria, extraCriterion);

Write Preview
Loading…
Cancel
Save