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

Fix child-lists when moving tasks to new parents; fix cache usage in filter matching (#2290)

Browse source
This commit is contained in:
Thomas Bruederli 2013-10-03 19:17:52 +02:00
parent f1a6254bc2
commit d259b5d88f
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
plugins/tasklist/tasklist.js
View file

@ -558,7 +558,9 @@ function rcube_tasklist_ui(settings)
var id = rec.id, var id = rec.id,
oldid = rec.tempid || id, oldid = rec.tempid || id,
oldrec = listdata[oldid],
oldindex = $.inArray(oldid, listindex), oldindex = $.inArray(oldid, listindex),
oldparent = oldrec && (oldrec._old_parent_id || oldrec.parent_id),
list = me.tasklists[rec.list]; list = me.tasklists[rec.list];
if (oldindex >= 0) if (oldindex >= 0)
@ -568,6 +570,15 @@ function rcube_tasklist_ui(settings)
listdata[id] = rec; listdata[id] = rec;
// remove child-pointer from old parent
if (oldparent && listdata[oldparent] && oldparent != rec.parent_id) {
var oldchilds = listdata[oldparent].children,
i = $.inArray(oldid, oldchilds);
if (i >= 0) {
oldchilds = oldchilds.slice(0,i).concat(oldchilds.slice(i+1));
}
}
// register a forward-pointer to child tasks // register a forward-pointer to child tasks
if (rec.parent_id && listdata[rec.parent_id] && listdata[rec.parent_id].children && $.inArray(id, listdata[rec.parent_id].children) >= 0) if (rec.parent_id && listdata[rec.parent_id] && listdata[rec.parent_id].children && $.inArray(id, listdata[rec.parent_id].children) >= 0)
listdata[rec.parent_id].children.push(id); listdata[rec.parent_id].children.push(id);
@ -853,6 +864,7 @@ function rcube_tasklist_ui(settings)
if (rec && parent.length) { if (rec && parent.length) {
// submit changes to server // submit changes to server
rec._old_parent_id = rec.parent_id;
rec.parent_id = drop_id || 0; rec.parent_id = drop_id || 0;
save_task(rec, 'edit'); save_task(rec, 'edit');
@ -1337,7 +1349,7 @@ function rcube_tasklist_ui(settings)
function match_filter(rec, cache, recursive) function match_filter(rec, cache, recursive)
{ {
// return cached result // return cached result
if (typeof cache[rec.id] != 'undefined') { if (typeof cache[rec.id] != 'undefined' && recursive != 2) {
return cache[rec.id]; return cache[rec.id];
} }
@ -1367,7 +1379,9 @@ function rcube_tasklist_ui(settings)
} }
} }
cache[rec.id] = match; if (recursive != 1) {
cache[rec.id] = match;
}
return match; return match;
} }