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

Bugfix to leaving list option

Browse Source
pull/14/head
Sam Bosley 13 years ago
parent 586fc12a5e
commit 852087ba74
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

2
astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java
Unescape Escape View File

@ -415,7 +415,7 @@ public class TagViewFragment extends TaskListFragment {
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
String uuid = tagData.getUuid(); String uuid = tagData.getUuid();
tagDataDao.delete(tagData.getId()); tagDataDao.delete(tagData.getId());
metadataDao.deleteWhere(Criterion.and(MetadataCriteria.withKey(TaskToTagMetadata.KEY), TagMetadata.TAG_UUID.eq(uuid))); metadataDao.deleteWhere(Criterion.and(MetadataCriteria.withKey(TaskToTagMetadata.KEY), TaskToTagMetadata.TAG_UUID.eq(uuid)));
tagMetadataDao.deleteWhere(TagMetadata.TAG_UUID.eq(uuid)); tagMetadataDao.deleteWhere(TagMetadata.TAG_UUID.eq(uuid));
tla.switchToActiveTasks(); tla.switchToActiveTasks();
} }

4
astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
Unescape Escape View File

@ -397,13 +397,13 @@ public final class TagService {
*/ */
public ArrayList<Tag> getTagList() { public ArrayList<Tag> getTagList() {
ArrayList<Tag> tagList = new ArrayList<Tag>(); ArrayList<Tag> tagList = new ArrayList<Tag>();
TodorooCursor<TagData> cursor = tagDataService.query(Query.select(TagData.PROPERTIES).orderBy(Order.asc(Functions.upper(TagData.NAME)))); TodorooCursor<TagData> cursor = tagDataService.query(Query.select(TagData.PROPERTIES).where(Criterion.and(TagData.DELETION_DATE.eq(0), TagData.NAME.isNotNull())).orderBy(Order.asc(Functions.upper(TagData.NAME))));
try { try {
TagData tagData = new TagData(); TagData tagData = new TagData();
for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) { for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
tagData.readFromCursor(cursor); tagData.readFromCursor(cursor);
Tag tag = new Tag(tagData); Tag tag = new Tag(tagData);
if(tagData.getValue(TagData.DELETION_DATE) > 0 || tagData.getFlag(TagData.FLAGS, TagData.FLAG_FEATURED)) { if(tagData.getFlag(TagData.FLAGS, TagData.FLAG_FEATURED)) {
continue; continue;
} }
if(TextUtils.isEmpty(tag.tag)) if(TextUtils.isEmpty(tag.tag))

Write Preview
Loading…
Cancel
Save