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

Merge pull request #121 from Alphix/delete_parent_folder_only

Browse source 
[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
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;
}; };