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

Updated copy on filter by unassigned in tag view

Browse Source
pull/14/head
Sam Bosley 13 years ago
parent 762294778d
commit b0543430be
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File

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

@ -280,8 +280,8 @@ public class TagViewFragment extends TaskListFragment {
addImageForMember(membersView, owner);
JSONObject unassigned = new JSONObject();
unassigned.put("id", Task.USER_ID_UNASSIGNED);
unassigned.put("name", getActivity().getString(R.string.actfm_EPA_unassigned));
unassigned.put("id", Task.USER_ID_UNASSIGNED); //$NON-NLS-1$
unassigned.put("name", getActivity().getString(R.string.actfm_EPA_unassigned)); //$NON-NLS-1$
addImageForMember(membersView, unassigned);
}
} catch (JSONException e) {
@ -340,14 +340,17 @@ public class TagViewFragment extends TaskListFragment {
if (currentId == ActFmPreferenceService.userId())
assignedCriterion = Criterion.or(Task.USER_ID.eq(0), Task.USER_ID.eq(id));
else if (currentId == Task.USER_ID_EMAIL && !TextUtils.isEmpty(email))
assignedCriterion = Task.USER.like("%" + email + "%"); //$NON-NLS-1$
assignedCriterion = Task.USER.like("%" + email + "%"); //$NON-NLS-1$ //$NON-NLS-2$
else
assignedCriterion = Task.USER_ID.eq(id);
Criterion assigned = Criterion.and(TaskCriteria.activeAndVisible(), assignedCriterion);
filter = TagFilterExposer.filterFromTag(getActivity(), new Tag(tagData), assigned);
TextView filterByAssigned = (TextView) getView().findViewById(R.id.filter_assigned);
filterByAssigned.setVisibility(View.VISIBLE);
filterByAssigned.setText(getString(R.string.actfm_TVA_filtered_by_assign, displayName));
if (id == Task.USER_ID_UNASSIGNED)
filterByAssigned.setText(getString(R.string.actfm_TVA_filter_by_unassigned));
else
filterByAssigned.setText(getString(R.string.actfm_TVA_filtered_by_assign, displayName));
setUpTaskList();
}
}

5
astrid/res/values/strings-actfm.xml
Unescape Escape View File

@ -69,6 +69,9 @@
<!-- Tag View: filtered by assigned to user (%s => user name) -->
<string name="actfm_TVA_filtered_by_assign">%s\'s tasks. Tap for all.</string>
<!-- Tag View: filter by unassigned tasks -->
<string name="actfm_TVA_filter_by_unassigned">Unassigned tasks. Tap for all.</string>
<!-- Tag View: list is private, no members -->
<string name="actfm_TVA_no_members_alert">Private: tap to share or edit</string>
@ -125,7 +128,7 @@
<string name="actfm_EPA_assign_me">Me</string>
<!-- task sharing dialog: anyone -->
<string name="actfm_EPA_unassigned">Anyone</string>
<string name="actfm_EPA_unassigned">Unassigned</string>
<!-- task sharing dialog: custom email assignment -->
<string name="actfm_EPA_assign_custom">Custom...</string>

Write Preview
Loading…
Cancel
Save