amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-28 00:09:29 +00:00
Code Issues Projects Releases Wiki Activity

fix(mail): Fix issue where unread counter is invalid when whanging folder. Fixes #6001.

Browse Source
This commit is contained in:
smizrahi
2024-08-20 14:51:35 +02:00
parent a24d59dfaf
commit 1f6bbc1044
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
UI/WebServerResources/js/Mailer/Mailbox.service.js
View File

@@ -1033,11 +1033,17 @@
*/
Mailbox.prototype.$reset = function(options) {
var _this = this;
var account;
angular.forEach(this.$shadowData, function(value, key) {
delete _this[key];
});
account = Object.assign({}, _this.$account)
angular.extend(this, this.$shadowData);
this.$shadowData = this.$omit();
this.account = account;
if (options && options.unseenCount) {
this.unseenCount = options.unseenCount;
}
if (options && options.filter) {
this.$messages = [];
this.$visibleMessages = [];

23
UI/WebServerResources/js/Mailer/sgMailboxListItem.directive.js
View File

@@ -53,8 +53,8 @@
/**
* @ngInject
*/
sgMailboxListItemController.$inject = ['$scope', '$rootScope', '$element', '$state', '$timeout', '$mdToast', '$mdPanel', '$mdMedia', '$mdSidenav', 'sgConstant', 'Dialog', 'Mailbox', 'encodeUriFilter'];
function sgMailboxListItemController($scope, $rootScope, $element, $state, $timeout, $mdToast, $mdPanel, $mdMedia, $mdSidenav, sgConstant, Dialog, Mailbox, encodeUriFilter) {
sgMailboxListItemController.$inject = ['$scope', '$rootScope', '$element', '$state', '$timeout', '$mdToast', '$mdPanel', '$mdMedia', '$mdSidenav', 'sgConstant', 'Dialog', 'Mailbox', 'encodeUriFilter', '$window', 'Account'];
function sgMailboxListItemController($scope, $rootScope, $element, $state, $timeout, $mdToast, $mdPanel, $mdMedia, $mdSidenav, sgConstant, Dialog, Mailbox, encodeUriFilter, $window, Account) {
var $ctrl = this;
@@ -87,13 +87,20 @@
if (this.editMode || this.mailbox == Mailbox.selectedFolder || this.mailbox.isNoSelect())
return;
this.mailbox.setHighlightWords([]);
if (Mailbox.$virtualMode) {
Mailbox.$virtualMode = false;
Mailbox.$virtualPath = false;
Mailbox.selectedFolder.$reset({ filter: true });
this.mailbox.setHighlightWords([]);
if (Mailbox.selectedFolder) {
if (Mailbox.$virtualMode) {
Mailbox.$virtualMode = false;
Mailbox.$virtualPath = false;
$rootScope.$broadcast('resetMailAdvancedSearchPanel'); // Reset advanced search panel (broadcast event to MailboxesController)
if (Mailbox.selectedFolder.$mailboxes && Mailbox.selectedFolder.$mailboxes.length > 0) {
Mailbox.selectedFolder.$reset({ filter: true, unseenCount: Mailbox.selectedFolder.$mailboxes[0].unseenCount });
}
} else {
Mailbox.selectedFolder.$reset({ filter: true, unseenCount: Mailbox.selectedFolder.unseenCount });
}
}
$rootScope.$broadcast('resetMailAdvancedSearchPanel'); // Reset advanced search panel (broadcast event to MailboxesController)
this.accountController.selectFolder(this);
if ($event) {