self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-23 22:36:32 +02:00
Code Issues Releases Activity

All: Resolves #483: Add trash folder (#9671)

Browse Source
This commit is contained in:
Laurent Cozic
2024-03-02 14:25:27 +00:00
committed by GitHub
parent 07fbd547dc
commit f19b1c5364
112 changed files with 2322 additions and 966 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/lib/BaseModel.ts
View File

@@ -40,6 +40,15 @@ export interface DeleteOptions {
trackDeleted?: boolean;
disableReadOnlyCheck?: boolean;
// Tells whether the deleted item should be moved to the trash. By default
// it is permanently deleted.
toTrash?: boolean;
// If the item is to be moved to the trash, tell what should be the new
// parent. By default the item will be moved at the root of the trash. Note
// that caller must ensure that this parent ID is a deleted folder.
toTrashParentId?: string;
}
class BaseModel {
@@ -308,7 +317,7 @@ class BaseModel {
return this.modelSelectAll(q.sql, q.params);
}
public static async byIds(ids: string[], options: any = null) {
public static async byIds(ids: string[], options: LoadOptions = null) {
if (!ids.length) return [];
if (!options) options = {};
if (!options.fields) options.fields = '*';