the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2025-01-01 20:42:19 +08:00
Code Issues Projects Releases Packages Wiki Activity

[snappymail] Allow deletion of parent folder with subfolders

Browse source 
This change brings snappymails behaviour in line with RFC3501, section 6.3.4,
by allowing "real" (i.e. non-\Noselect) parent folders to be deleted and
by not performing a recursive deletion of subfolders.
This commit is contained in:
David Härdeman 2021-08-24 18:01:09 +02:00
parent ef4d604f6d
commit 72ff960114
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dev/Model/FolderCollection.js
View file

@ -304,7 +304,7 @@ export class FolderModel extends AbstractModel {
return null; return null;
}, },
canBeDeleted: () => !folder.isSystemFolder() && !folder.subFolders().length, canBeDeleted: () => !folder.isSystemFolder() && folder.selectable,
canBeSubscribed: () => !folder.isSystemFolder() canBeSubscribed: () => !folder.isSystemFolder()
&& SettingsUserStore.hideUnsubscribed() && SettingsUserStore.hideUnsubscribed()

2
dev/Settings/User/Folders.js
View file

@ -98,7 +98,7 @@ export class FoldersUserSettings {
if (folderToRemove === folder) { if (folderToRemove === folder) {
return true; return true;
} }
folder.subFolders.remove(fRemoveFolder); //folder.subFolders.remove(fRemoveFolder);
return false; return false;
}; };