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

Resolve issue #112

Browse source
This commit is contained in:
djmaze 2021-08-19 15:14:47 +02:00
parent 1f9e96f107
commit ba477e25ff
12 changed files with 82 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,6 +11,8 @@ import { SieveUserStore } from 'Stores/User/Sieve';
import { decorateKoCommands } from 'Knoin/Knoin';
import { AbstractViewPopup } from 'Knoin/AbstractViews';
import { folderListOptionsBuilder } from 'Common/UtilsUser';
class FilterPopupView extends AbstractViewPopup {
constructor() {
super('Filter');
@ -25,7 +27,15 @@ class FilterPopupView extends AbstractViewPopup {
this.fTrueCallback = null;
this.defaultOptionsAfterRender = defaultOptionsAfterRender;
this.folderSelectList = FolderUserStore.folderMenuForFilters;
this.folderSelectList = ko.computed(() =>
folderListOptionsBuilder(
FolderUserStore.folderListSystem(),
[FolderUserStore.sieveAllowFileintoInbox ? '' : 'INBOX'],
[['', '']],
item => item ? item.localName() : ''
)
);
this.selectedFolderValue.subscribe(() => this.filter() && this.filter().actionValueError(false));

6
dev/View/Popup/FolderCreate.js
View file

@ -25,14 +25,14 @@ class FolderCreatePopupView extends AbstractViewPopup {
this.parentFolderSelectList = ko.computed(() =>
folderListOptionsBuilder(
[],
FolderUserStore.folderList(),
[],
[['', '']],
oItem =>
oItem ? (oItem.isSystemFolder() ? oItem.name() + ' ' + oItem.manageFolderSystemName() : oItem.name()) : '',
FolderUserStore.namespace
? item => FolderUserStore.namespace !== item.fullNameRaw.substr(0, FolderUserStore.namespace.length)
: null,
oItem =>
oItem ? (oItem.isSystemFolder() ? oItem.name() + ' ' + oItem.manageFolderSystemName() : oItem.name()) : ''
true
)
);

7
dev/View/Popup/FolderSystem.js
View file

@ -30,16 +30,11 @@ class FolderSystemPopupView extends AbstractViewPopup {
this.folderSelectList = ko.computed(() =>
folderListOptionsBuilder(
[],
FolderUserStore.folderList(),
FolderUserStore.folderListSystemNames(),
[
['', this.sChooseOnText],
[UNUSED_OPTION_VALUE, this.sUnuseText]
],
null,
null,
null,
true
]
)
);

11
dev/View/User/MailBox/MessageList.js
View file

@ -15,7 +15,7 @@ import { UNUSED_OPTION_VALUE } from 'Common/Consts';
import { doc, leftPanelDisabled, moveAction, Settings, SettingsGet } from 'Common/Globals';
import { computedPaginatorHelper, showMessageComposer } from 'Common/UtilsUser';
import { computedPaginatorHelper, showMessageComposer, folderListOptionsBuilder } from 'Common/UtilsUser';
import { FileInfo } from 'Common/File';
import { mailBox, serverRequest } from 'Common/Links';
@ -78,7 +78,14 @@ export class MessageListMailBoxUserView extends AbstractViewRight {
this.isMessageSelected = MessageUserStore.isMessageSelected;
this.messageListSearch = MessageUserStore.listSearch;
this.messageListError = MessageUserStore.listError;
this.folderMenuForMove = FolderUserStore.folderMenuForMove;
this.folderMenuForMove = ko.computed(() =>
folderListOptionsBuilder(
FolderUserStore.folderListSystem(),
[FolderUserStore.currentFolderFullNameRaw()],
[],
item => item ? item.localName() : ''
)
);
this.useCheckboxesInList = SettingsUserStore.useCheckboxesInList;