Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 18:36:30 +01:00
Code Issues Packages Projects Releases Activity

soft-deleting note will delete its content and all the revisions content, fixes #132

Browse Source
This commit is contained in:
azivner
2018-07-26 09:08:51 +02:00
parent 5b98c1c0f3
commit 7e4d70259f
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
db/migrations/0105__delete_content_from_soft_deleted_notes.sql Normal file
View File

@@ -0,0 +1,2 @@
UPDATE notes SET content = '' WHERE isDeleted = 1;
UPDATE note_revisions SET content = '' WHERE (SELECT isDeleted FROM notes WHERE noteId = note_revisions.noteId) = 1;

2
src/services/app_info.js
View File

@@ -3,7 +3,7 @@
const build = require('./build'); const build = require('./build');
const packageJson = require('../../package'); const packageJson = require('../../package');
const APP_DB_VERSION = 104; const APP_DB_VERSION = 105;
const SYNC_VERSION = 1; const SYNC_VERSION = 1;
module.exports = { module.exports = {

6
src/services/notes.js
View File

@@ -223,8 +223,14 @@ async function deleteNote(branch) {
if (notDeletedBranches.length === 0) { if (notDeletedBranches.length === 0) {
note.isDeleted = true; note.isDeleted = true;
note.content = '';
await note.save(); await note.save();
for (const noteRevision of await note.getRevisions()) {
noteRevision.content = '';
await noteRevision.save();
}
for (const childBranch of await note.getChildBranches()) { for (const childBranch of await note.getChildBranches()) {
await deleteNote(childBranch); await deleteNote(childBranch);
} }