Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-10-31 21:11:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix deleting / erasing note

Browse Source
This commit is contained in:
zadam 2022-09-21 23:58:54 +02:00
parent 15ed381f85
commit 0c196ae3a5
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/public/app/entities/branch.js
View File

@ -52,6 +52,12 @@ class Branch {
get toString() { get toString() {
return `Branch(branchId=${this.branchId})`; return `Branch(branchId=${this.branchId})`;
} }
get pojo() {
const pojo = {...this};
delete pojo.froca;
return pojo;
}
} }
export default Branch; export default Branch;

2
src/public/app/widgets/note_tree.js
View File

@ -670,7 +670,7 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
const note = branch.getNoteFromCache(); const note = branch.getNoteFromCache();
if (!note) { if (!note) {
throw new Error(`Branch "${branch.branchId}" has no note "${branch.noteId}"`); throw new Error(`Branch "${branch.branchId}" has no child note "${branch.noteId}"`);
} }
const title = (branch.prefix ? (branch.prefix + " - ") : "") + note.title; const title = (branch.prefix ? (branch.prefix + " - ") : "") + note.title;

7
src/routes/api/branches.js
View File

@ -194,10 +194,15 @@ function deleteBranch(req) {
const taskContext = TaskContext.getInstance(req.query.taskId, 'delete-notes'); const taskContext = TaskContext.getInstance(req.query.taskId, 'delete-notes');
const deleteId = utils.randomString(10); const deleteId = utils.randomString(10);
const noteDeleted = branch.deleteBranch(deleteId, taskContext); let noteDeleted;
if (eraseNotes) { if (eraseNotes) {
// erase automatically means deleting all clones + note itself
branch.getNote().deleteNote(deleteId, taskContext);
noteService.eraseNotesWithDeleteId(deleteId); noteService.eraseNotesWithDeleteId(deleteId);
noteDeleted = true;
} else {
noteDeleted = branch.deleteBranch(deleteId, taskContext);
} }
if (last) { if (last) {

8
src/services/notes.js
View File

@ -735,10 +735,6 @@ function eraseDeletedEntities(eraseEntitiesAfterTimeInSeconds = null) {
const attributeIdsToErase = sql.getColumn("SELECT attributeId FROM attributes WHERE isDeleted = 1 AND utcDateModified <= ?", [dateUtils.utcDateTimeStr(cutoffDate)]); const attributeIdsToErase = sql.getColumn("SELECT attributeId FROM attributes WHERE isDeleted = 1 AND utcDateModified <= ?", [dateUtils.utcDateTimeStr(cutoffDate)]);
eraseAttributes(attributeIdsToErase); eraseAttributes(attributeIdsToErase);
if (noteIdsToErase.length > 0 || branchIdsToErase.length > 0 || attributeIdsToErase.length > 0) {
require('../becca/becca_loader').reload();
}
}); });
} }
@ -754,10 +750,6 @@ function eraseNotesWithDeleteId(deleteId) {
const attributeIdsToErase = sql.getColumn("SELECT attributeId FROM attributes WHERE deleteId = ?", [deleteId]); const attributeIdsToErase = sql.getColumn("SELECT attributeId FROM attributes WHERE deleteId = ?", [deleteId]);
eraseAttributes(attributeIdsToErase); eraseAttributes(attributeIdsToErase);
if (noteIdsToErase.length > 0 || branchIdsToErase.length > 0 || attributeIdsToErase.length > 0) {
require('../becca/becca_loader').reload();
}
} }
function eraseDeletedNotesNow() { function eraseDeletedNotesNow() {