diff --git a/dev/Model/FolderCollection.js b/dev/Model/FolderCollection.js index 92d76a615..25aa92785 100644 --- a/dev/Model/FolderCollection.js +++ b/dev/Model/FolderCollection.js @@ -210,7 +210,7 @@ export class FolderModel extends AbstractModel { privateMessageCountAll: 0, privateMessageCountUnread: 0, - kolab: null, + kolabType: null, collapsedPrivate: true }); @@ -229,8 +229,9 @@ export class FolderModel extends AbstractModel { if (folder) { folder.deep = json.FullNameRaw.split(folder.delimiter).length - 1; - let type = folder.metadata[FolderMetadataKeys.KolabFolderType] || folder.metadata[FolderMetadataKeys.KolabFolderTypeShared]; - (type && !type.includes('mail.')) ? folder.kolab(type) : 0; + let type = folder.metadata[FolderMetadataKeys.KolabFolderType] + || folder.metadata[FolderMetadataKeys.KolabFolderTypeShared]; + type && !type.includes('mail.') && folder.kolabType(type); folder.messageCountAll = ko.computed({ read: folder.privateMessageCountAll, @@ -311,7 +312,7 @@ export class FolderModel extends AbstractModel { canBeSubscribed: () => Settings.app('useImapSubscribe') && !(folder.isSystemFolder() | !SettingsUserStore.hideUnsubscribed() | !folder.selectable()), - canBeSelected: () => !(folder.isSystemFolder() | !folder.selectable() | folder.kolab()), + canBeSelected: () => !(folder.isSystemFolder() | !folder.selectable() | folder.kolabType()), localName: () => { let name = folder.name(); diff --git a/dev/View/User/MailBox/FolderList.js b/dev/View/User/MailBox/FolderList.js index 2a62808fb..83fc6d42f 100644 --- a/dev/View/User/MailBox/FolderList.js +++ b/dev/View/User/MailBox/FolderList.js @@ -42,7 +42,7 @@ export class MailFolderList extends AbstractViewLeft { addComputablesTo(this, { folderListFocused: () => Scope.FolderList === AppUserStore.focusedState(), - folderListVisible: () => FolderUserStore.folderList().filter(v => !(v.hidden() || v.kolab())) + folderListVisible: () => FolderUserStore.folderList().filter(v => !(v.hidden() || v.kolabType())) }); }