Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-29 12:09:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bugfix: inboxFolderName was incorrect

Browse source 
You could have potentionally deleted INBOX and other issues
This commit is contained in:
djmaze 2020-10-15 12:23:11 +02:00
parent 3bfe2c67d1
commit b68d04aacd
4 changed files with 23 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

10
dev/Model/Folder.js
View file

@ -3,7 +3,6 @@ import ko from 'ko';
import { FolderType } from 'Common/Enums';
import { isPosNumeric } from 'Common/UtilsUser';
import { i18n, trigger as translatorTrigger } from 'Common/Translator';
import { getFolderInboxName } from 'Common/Cache';
import { AbstractModel } from 'Knoin/AbstractModel';
@ -56,8 +55,6 @@ class FolderModel extends AbstractModel {
* @returns {FolderModel}
*/
initComputed() {
const inboxFolderName = getFolderInboxName();
this.isInbox = ko.computed(() => FolderType.Inbox === this.type());
this.hasSubScribedSubfolders = ko.computed(
@ -136,11 +133,11 @@ class FolderModel extends AbstractModel {
this.canBeDeleted = ko.computed(() => {
const bSystem = this.isSystemFolder();
return !bSystem && !this.subFolders().length && inboxFolderName !== this.fullNameRaw;
return !bSystem && !this.subFolders().length;
});
this.canBeSubScribed = ko.computed(
() => !this.isSystemFolder() && this.selectable && inboxFolderName !== this.fullNameRaw
() => !this.isSystemFolder() && this.selectable
);
this.canBeChecked = this.canBeSubScribed;
@ -263,7 +260,6 @@ class FolderModel extends AbstractModel {
*/
initByJson(json) {
let bResult = false;
const sInboxFolderName = getFolderInboxName();
if (json && 'Object/Folder' === json['@Object']) {
this.name(json.Name);
@ -278,8 +274,6 @@ class FolderModel extends AbstractModel {
this.subScribed(!!json.IsSubscribed);
this.checkable(!!json.Checkable);
this.type(sInboxFolderName === this.fullNameRaw ? FolderType.Inbox : FolderType.User);
bResult = true;
}

9
dev/Model/FolderCollection.js
View file

@ -2,7 +2,7 @@ import { AbstractCollectionModel } from 'Model/AbstractCollection';
import { UNUSED_OPTION_VALUE } from 'Common/Consts';
import { pInt } from 'Common/Utils';
import { ClientSideKeyName, ServerFolderType } from 'Common/Enums';
import { ClientSideKeyName, FolderType, ServerFolderType } from 'Common/Enums';
import * as Cache from 'Common/Cache';
import * as Local from 'Storage/Client';
@ -55,8 +55,11 @@ export class FolderCollectionModel extends AbstractCollectionModel
if (!oCacheFolder) {
oCacheFolder = FolderModel.newInstanceFromJson(oFolder);
if (oCacheFolder) {
Cache.setFolderToCacheList(oFolder.FullNameRaw, oCacheFolder);
Cache.setFolderFullNameRaw(oCacheFolder.fullNameHash, oFolder.FullNameRaw, oCacheFolder);
if (oFolder.FullNameRaw == result.SystemFolders[ServerFolderType.INBOX]) {
oCacheFolder.type(FolderType.Inbox);
Cache.setFolderInboxName(oFolder.FullNameRaw);
}
Cache.setFolder(oCacheFolder.fullNameHash, oFolder.FullNameRaw, oCacheFolder);
}
}