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

Resolve CardDAV sync not working due to new login system #163

Browse source
This commit is contained in:
djmaze 2021-11-24 08:36:27 +01:00
parent 00ef26a905
commit e27fb46500
3 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
dev/App/User.js
View file

@ -720,6 +720,7 @@ class AppUser extends AbstractApp {
AccountUserStore.email(SettingsGet('Email')); AccountUserStore.email(SettingsGet('Email'));
SettingsUserStore.init(); SettingsUserStore.init();
ContactUserStore.init();
this.foldersReload(value => { this.foldersReload(value => {
try { try {

2
dev/Stores/User/Folder.js
View file

@ -52,8 +52,6 @@ export const FolderUserStore = new class {
self.currentFolder = ko.observable(null).extend({ toggleSubscribeProperty: [self, 'selected'] }); self.currentFolder = ko.observable(null).extend({ toggleSubscribeProperty: [self, 'selected'] });
self.sieveAllowFileintoInbox = !!SettingsGet('SieveAllowFileintoInbox');
addComputablesTo(self, { addComputablesTo(self, {
draftFolderNotEnabled: () => !self.draftFolder() || UNUSED_OPTION_VALUE === self.draftFolder(), draftFolderNotEnabled: () => !self.draftFolder() || UNUSED_OPTION_VALUE === self.draftFolder(),

5
dev/View/Popup/Filter.js
View file

@ -2,10 +2,10 @@ import ko from 'ko';
import { FilterAction } from 'Model/Filter'; import { FilterAction } from 'Model/Filter';
import { FilterConditionField, FilterConditionType } from 'Model/FilterCondition'; import { FilterConditionField, FilterConditionType } from 'Model/FilterCondition';
import { SettingsGet } from 'Common/Globals';
import { defaultOptionsAfterRender } from 'Common/Utils'; import { defaultOptionsAfterRender } from 'Common/Utils';
import { i18n, initOnStartOrLangChange } from 'Common/Translator'; import { i18n, initOnStartOrLangChange } from 'Common/Translator';
import { FolderUserStore } from 'Stores/User/Folder';
import { SieveUserStore } from 'Stores/User/Sieve'; import { SieveUserStore } from 'Stores/User/Sieve';
import { decorateKoCommands } from 'Knoin/Knoin'; import { decorateKoCommands } from 'Knoin/Knoin';
@ -30,13 +30,12 @@ class FilterPopupView extends AbstractViewPopup {
this.defaultOptionsAfterRender = defaultOptionsAfterRender; this.defaultOptionsAfterRender = defaultOptionsAfterRender;
this.folderSelectList = ko.computed(() => this.folderSelectList = ko.computed(() =>
folderListOptionsBuilder( folderListOptionsBuilder(
[FolderUserStore.sieveAllowFileintoInbox ? '' : 'INBOX'], [SettingsGet('SieveAllowFileintoInbox') ? '' : 'INBOX'],
[['', '']], [['', '']],
item => item ? item.localName() : '' item => item ? item.localName() : ''
) )
); );
this.selectedFolderValue.subscribe(() => this.filter() && this.filter().actionValueError(false)); this.selectedFolderValue.subscribe(() => this.filter() && this.filter().actionValueError(false));
['actionTypeOptions','fieldOptions','typeOptions','typeOptionsSize','typeOptionsBody'].forEach( ['actionTypeOptions','fieldOptions','typeOptions','typeOptionsSize','typeOptionsBody'].forEach(