mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-08-29 12:09:20 +03:00
Drop use_imap_list_subscribe and use 'HideUnsubscribed' = false
This prevents user questions regarding: "my folders are missing"
This commit is contained in:
parent
661e937fd1
commit
5757d8d464
11 changed files with 26 additions and 37 deletions
|
|
@ -216,10 +216,11 @@ class RemoteUserFetch extends AbstractFetchRemote {
|
|||
}
|
||||
|
||||
/*
|
||||
folderMove(sPrevFolderFullName, sNewFolderFullName) {
|
||||
folderMove(sPrevFolderFullName, sNewFolderFullName, bSubscribe) {
|
||||
return this.post('FolderMove', FolderUserStore.foldersRenaming, {
|
||||
Folder: sPrevFolderFullName,
|
||||
NewFolder: sNewFolderFullName
|
||||
NewFolder: sNewFolderFullName,
|
||||
Subscribe: bSubscribe ? 1 : 0
|
||||
});
|
||||
}
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -62,7 +62,6 @@ export class FoldersUserSettings /*extends AbstractViewSettings*/ {
|
|||
|
||||
this.folderForEdit = ko.observable(null).extend({ toggleSubscribeProperty: [this, 'edited'] });
|
||||
|
||||
this.useImapSubscribe = Settings.app('useImapSubscribe');
|
||||
SettingsUserStore.hideUnsubscribed.subscribe(value => Remote.saveSetting('HideUnsubscribed', value ? 1 : 0));
|
||||
}
|
||||
|
||||
|
|
@ -72,7 +71,8 @@ export class FoldersUserSettings /*extends AbstractViewSettings*/ {
|
|||
if (nameToEdit && folder.name() !== nameToEdit) {
|
||||
Remote.abort('Folders').post('FolderRename', FolderUserStore.foldersRenaming, {
|
||||
Folder: folder.fullName,
|
||||
NewFolderName: nameToEdit
|
||||
NewFolderName: nameToEdit,
|
||||
Subscribe: folder.subscribed() ? 1 : 0
|
||||
})
|
||||
.then(data => {
|
||||
folder.name(nameToEdit/*data.Name*/);
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import { koComputable } from 'External/ko';
|
|||
|
||||
import { Layout, EditorDefaultType } from 'Common/EnumsUser';
|
||||
import { pInt, addObservablesTo } from 'Common/Utils';
|
||||
import { $htmlCL, Settings, SettingsGet } from 'Common/Globals';
|
||||
import { $htmlCL, SettingsGet } from 'Common/Globals';
|
||||
import { ThemeStore } from 'Stores/Theme';
|
||||
|
||||
export const SettingsUserStore = new class {
|
||||
|
|
@ -34,7 +34,7 @@ export const SettingsUserStore = new class {
|
|||
allowDraftAutosave: 1,
|
||||
useThreads: 0,
|
||||
replySameFolder: 0,
|
||||
hideUnsubscribed: 1,
|
||||
hideUnsubscribed: 0,
|
||||
autoLogout: 0
|
||||
});
|
||||
|
||||
|
|
@ -74,13 +74,13 @@ export const SettingsUserStore = new class {
|
|||
self.messageReadDelay(pInt(SettingsGet('MessageReadDelay')));
|
||||
self.autoLogout(pInt(SettingsGet('AutoLogout')));
|
||||
|
||||
self.showImages(!!SettingsGet('ShowImages'));
|
||||
self.removeColors(!!SettingsGet('RemoveColors'));
|
||||
self.useCheckboxesInList(!!SettingsGet('UseCheckboxesInList'));
|
||||
self.allowDraftAutosave(!!SettingsGet('AllowDraftAutosave'));
|
||||
self.useThreads(!!SettingsGet('UseThreads'));
|
||||
self.replySameFolder(!!SettingsGet('ReplySameFolder'));
|
||||
self.showImages(SettingsGet('ShowImages'));
|
||||
self.removeColors(SettingsGet('RemoveColors'));
|
||||
self.useCheckboxesInList(SettingsGet('UseCheckboxesInList'));
|
||||
self.allowDraftAutosave(SettingsGet('AllowDraftAutosave'));
|
||||
self.useThreads(SettingsGet('UseThreads'));
|
||||
self.replySameFolder(SettingsGet('ReplySameFolder'));
|
||||
|
||||
self.hideUnsubscribed(Settings.app('useImapSubscribe') && SettingsGet('HideUnsubscribed'));
|
||||
self.hideUnsubscribed(SettingsGet('HideUnsubscribed'));
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ import { UNUSED_OPTION_VALUE } from 'Common/Consts';
|
|||
import { defaultOptionsAfterRender } from 'Common/Utils';
|
||||
import { folderListOptionsBuilder, sortFolders } from 'Common/UtilsUser';
|
||||
import { getNotification } from 'Common/Translator';
|
||||
import { Settings } from 'Common/Globals';
|
||||
|
||||
import { FolderUserStore } from 'Stores/User/Folder';
|
||||
import { SettingsUserStore } from 'Stores/User/Settings';
|
||||
|
|
@ -22,11 +21,9 @@ class FolderCreatePopupView extends AbstractViewPopup {
|
|||
constructor() {
|
||||
super('FolderCreate');
|
||||
|
||||
this.useImapSubscribe = Settings.app('useImapSubscribe');
|
||||
|
||||
this.addObservables({
|
||||
folderName: '',
|
||||
folderSubscribe: this.useImapSubscribe && SettingsUserStore.hideUnsubscribed,
|
||||
folderSubscribe: SettingsUserStore.hideUnsubscribed(),
|
||||
|
||||
selectedParentValue: UNUSED_OPTION_VALUE
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue