Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Consider task hierarchy when matching current filter and tags selection (#2290):

Browse source 
- Show children of matching tasks
- Show ancestors if a child task matches
This commit is contained in:
Thomas Bruederli 2013-10-03 17:13:22 +02:00
parent eee97dc178
commit 59bae43b01
1 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
plugins/tasklist/tasklist.js
View file

@ -467,13 +467,14 @@ function rcube_tasklist_ui(settings)
// clear display // clear display
var id, rec, var id, rec,
count = 0, count = 0,
cache = {},
msgbox = $('#listmessagebox').hide(), msgbox = $('#listmessagebox').hide(),
list = $(rcmail.gui_objects.resultlist).html(''); list = $(rcmail.gui_objects.resultlist).html('');
for (var i=0; i < listindex.length; i++) { for (var i=0; i < listindex.length; i++) {
id = listindex[i]; id = listindex[i];
rec = listdata[id]; rec = listdata[id];
if (match_filter(rec)) { if (match_filter(rec, cache)) {
render_task(rec); render_task(rec);
count++; count++;
} }
@ -1333,9 +1334,14 @@ function rcube_tasklist_ui(settings)
/** /**
* Check if the given task matches the current filtermask and tag selection * Check if the given task matches the current filtermask and tag selection
*/ */
function match_filter(rec) function match_filter(rec, cache, recursive)
{ {
var match = !filtermask || (filtermask & rec.mask) > 0; // return cached result
if (typeof cache[rec.id] != 'undefined') {
return cache[rec.id];
}
var match = !filtermask || (filtermask & rec.mask) > 0
if (match && tagsfilter.length) { if (match && tagsfilter.length) {
match = rec.tags && rec.tags.length; match = rec.tags && rec.tags.length;
@ -1345,6 +1351,23 @@ function rcube_tasklist_ui(settings)
} }
} }
// check if a child task matches the tags
if (!match && (recursive||0) < 2 && rec.children && rec.children.length) {
for (var j=0; !match && j < rec.children.length; j++) {
match = match_filter(listdata[rec.children[j]], cache, 1);
}
}
// walk up the task tree and check if a parent task matches
var parent_id;
if (!match && !recursive && (parent_id = rec.parent_id)) {
while (!match && parent_id && listdata[parent_id]) {
match = match_filter(listdata[parent_id], cache, 2);
parent_id = listdata[parent_id].parent_id;
}
}
cache[rec.id] = match;
return match; return match;
} }