extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-02 20:19:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

update unseen counter in folder-tree for delete too

Browse Source
This commit is contained in:
Ralf Becker 2020-08-06 09:02:17 +02:00
parent fba4323765
commit 6e2745f129
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mail/js/app.js
View File

@ -406,8 +406,17 @@ app.classes.mail = AppJS.extend(
let id0 = typeof pushData.id === 'string' ? pushData.id : pushData.id[0]; let id0 = typeof pushData.id === 'string' ? pushData.id : pushData.id[0];
let acc_id = id0.split('::')[1]; let acc_id = id0.split('::')[1];
let folder = acc_id+'::'+atob(id0.split('::')[2]); let folder = acc_id+'::'+atob(id0.split('::')[2]);
let foldertree = this.et2 ? this.et2.getWidgetById('nm[foldertree]') : null;
this.push_active[acc_id] = true; this.push_active[acc_id] = true;
// update unseen counter in folder-tree (also for delete)
if (pushData.acl.folder && typeof pushData.acl.unseen !== 'undefined')
{
let folder_id = {};
folder_id[folder] = foldertree.getLabel(folder).replace(this._unseen_regexp, '')+(pushData.acl.unseen ? " ("+pushData.acl.unseen+")" : '');
this.mail_setFolderStatus(folder_id);
}
// only handle delete by default, for simple case of uid === "$app::$id" // only handle delete by default, for simple case of uid === "$app::$id"
if (pushData.type === 'delete') if (pushData.type === 'delete')
{ {
@ -428,7 +437,6 @@ app.classes.mail = AppJS.extend(
let nm_value = nm ? nm.getValue() : null; let nm_value = nm ? nm.getValue() : null;
// nm_value.selectedFolder is not always set, read it from foldertree, if not // nm_value.selectedFolder is not always set, read it from foldertree, if not
let foldertree = this.et2 ? this.et2.getWidgetById('nm[foldertree]') : null;
let displayed_folder = (nm_value ? nm_value.selectedFolder : null) || (foldertree ? foldertree.getValue() : ''); let displayed_folder = (nm_value ? nm_value.selectedFolder : null) || (foldertree ? foldertree.getValue() : '');
if (!displayed_folder.match(/::/)) displayed_folder += '::INBOX'; if (!displayed_folder.match(/::/)) displayed_folder += '::INBOX';
if (folder === displayed_folder) if (folder === displayed_folder)
@ -452,13 +460,6 @@ app.classes.mail = AppJS.extend(
nm.refresh(pushData.id, pushData.type === 'update' ? 'update-in-place' : pushData.type, pushData.messages); nm.refresh(pushData.id, pushData.type === 'update' ? 'update-in-place' : pushData.type, pushData.messages);
} }
} }
// update unseen counter in folder-tree
if (pushData.acl.folder && typeof pushData.acl.unseen !== 'undefined')
{
let folder_id = {};
folder_id[folder] = foldertree.getLabel(folder).replace(this._unseen_regexp, '')+(pushData.acl.unseen ? " ("+pushData.acl.unseen+")" : '');
this.mail_setFolderStatus(folder_id);
}
}, },
/** /**