amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-08-21 06:33:18 +00:00
Code Issues Projects Releases Wiki Activity

fix(mail): return unseen count of mailbox in msgs operations

Browse Source
This commit is contained in:
Francis Lachapelle
2021-06-29 17:05:48 -04:00
parent 09d300ec65
commit a35225631a
6 changed files with 98 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/js/Mailer/MailboxesController.js
+1 -44
View File
@@ -34,7 +34,7 @@
this.showSubscribedOnly = Preferences.defaults.SOGoMailShowSubscribedFoldersOnly;
this.refreshUnseenCount();
Account.refreshUnseenCount($window.unseenCountFolders);
_registerHotkeys(hotkeys);
@@ -270,49 +270,6 @@
}
}; // delegate
this.refreshUnseenCount = function() {
var unseenCountFolders, refreshViewCheck;
if (Preferences.defaults.SOGoMailFetchAllUnseenCountFolders === 1)
unseenCountFolders = [];
else
unseenCountFolders = $window.unseenCountFolders;
_.forEach(vm.accounts, function(account) {
if (Preferences.defaults.SOGoMailFetchAllUnseenCountFolders === 1) {
// Include all mailboxes
_.forEach(account.$$flattenMailboxes, function(mailbox) {
unseenCountFolders.push(mailbox.id);
});
}
else {
// Always include the INBOX
if (!_.includes(unseenCountFolders, account.id + '/folderINBOX'))
unseenCountFolders.push(account.id + '/folderINBOX');
_.forEach(account.$$flattenMailboxes, function(mailbox) {
if (angular.isDefined(mailbox.unseenCount) &&
!_.includes(unseenCountFolders, mailbox.id))
unseenCountFolders.push(mailbox.id);
});
}
});
Account.$$resource.post('', 'unseenCount', {mailboxes: unseenCountFolders}).then(function(data) {
_.forEach(vm.accounts, function(account) {
_.forEach(account.$$flattenMailboxes, function(mailbox) {
if (data[mailbox.id]) {
mailbox.unseenCount = data[mailbox.id];
}
});
});
});
refreshViewCheck = Preferences.defaults.SOGoRefreshViewCheck;
if (refreshViewCheck && refreshViewCheck != 'manually')
$timeout(vm.refreshUnseenCount, refreshViewCheck.timeInterval()*1000);
};
this.isDroppableFolder = function(srcFolder, dstFolder) {
return (dstFolder.id != srcFolder.id) && !dstFolder.isNoSelect();
};