Merge pull request #121 from Alphix/delete_parent_folder_only

[snappymail] Allow deletion of parent folder with subfolders
This commit is contained in:
the-djmaze 2021-08-24 19:41:59 +02:00 committed by GitHub
commit e2a7d1f5f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

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

View file

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