Bugfix: saveSystemFolders failed at initialization of mailbox

This commit is contained in:
djmaze 2021-12-01 12:04:17 +01:00
parent f23f2d13ce
commit 31db5ee238

View file

@ -28,7 +28,7 @@ normalizeFolder = sFolderFullName => ('' === sFolderFullName
: ''; : '';
// index is FolderType value // index is FolderType value
let SystemFolders = []; let SystemFolders = [0,'','','','','','',''];
export class FolderCollectionModel extends AbstractCollectionModel export class FolderCollectionModel extends AbstractCollectionModel
{ {
@ -116,27 +116,26 @@ export class FolderCollectionModel extends AbstractCollectionModel
FolderUserStore.displaySpecSetting(Settings.app('folderSpecLimit') < this.CountRec); FolderUserStore.displaySpecSetting(Settings.app('folderSpecLimit') < this.CountRec);
if (SystemFolders && if (SystemFolders &&
!('' + !(
SettingsGet('SentFolder') + SettingsGet('SentFolder') +
SettingsGet('DraftFolder') + SettingsGet('DraftFolder') +
SettingsGet('SpamFolder') + SettingsGet('SpamFolder') +
SettingsGet('TrashFolder') + SettingsGet('TrashFolder') +
SettingsGet('ArchiveFolder')) SettingsGet('ArchiveFolder')
)
) { ) {
FolderUserStore.saveSystemFolders({ FolderUserStore.saveSystemFolders({
SentFolder: SystemFolders[FolderType.SENT] || null, SentFolder: SystemFolders[FolderType.Sent],
DraftFolder: SystemFolders[FolderType.DRAFTS] || null, DraftFolder: SystemFolders[FolderType.Drafts],
SpamFolder: SystemFolders[FolderType.SPAM] || null, SpamFolder: SystemFolders[FolderType.Spam],
TrashFolder: SystemFolders[FolderType.TRASH] || null, TrashFolder: SystemFolders[FolderType.Trash],
ArchiveFolder: SystemFolders[FolderType.ARCHIVE] || null ArchiveFolder: SystemFolders[FolderType.Archive]
}); });
} }
FolderUserStore.folderList(this); FolderUserStore.folderList(this);
if (undefined !== this.Namespace) { FolderUserStore.namespace = this.Namespace;
FolderUserStore.namespace = this.Namespace;
}
AppUserStore.threadsAllowed(!!(Settings.app('useImapThread') && this.IsThreadsSupported)); AppUserStore.threadsAllowed(!!(Settings.app('useImapThread') && this.IsThreadsSupported));
@ -195,7 +194,6 @@ export class FolderModel extends AbstractModel {
this.fullName = ''; this.fullName = '';
this.fullNameHash = ''; this.fullNameHash = '';
this.delimiter = ''; this.delimiter = '';
this.namespace = '';
this.deep = 0; this.deep = 0;
this.expires = 0; this.expires = 0;
this.metadata = {}; this.metadata = {};