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

isErased fixes

Browse Source
This commit is contained in:
zadam
2020-12-18 22:35:40 +01:00
parent f8089ba370
commit 6c15d299e0
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/public/app/services/link.js
View File

@@ -144,11 +144,8 @@ async function loadReferenceLinkTitle(noteId, $el) {
if (!note) { if (!note) {
title = '[missing]'; title = '[missing]';
} }
else if (!note.isDeleted) {
title = note.title;
}
else { else {
title = note.isErased ? '[erased]' : `${note.title} (deleted)`; title = note.isDeleted ? `${note.title} (deleted)` : note.title;
} }
$el.text(title); $el.text(title);

5
src/public/app/widgets/attribute_widgets/attribute_editor.js
View File

@@ -446,11 +446,8 @@ export default class AttributeEditorWidget extends TabAwareWidget {
if (!note) { if (!note) {
title = '[missing]'; title = '[missing]';
} }
else if (!note.isDeleted) {
title = note.title;
}
else { else {
title = note.isErased ? '[erased]' : `${note.title} (deleted)`; title = note.isDeleted ? `${note.title} (deleted)` : note.title;
} }
$el.text(title); $el.text(title);

4
src/services/notes.js
View File

@@ -466,7 +466,7 @@ function saveNoteRevision(note) {
const revisionCutoff = dateUtils.utcDateStr(new Date(now.getTime() - noteRevisionSnapshotTimeInterval * 1000)); const revisionCutoff = dateUtils.utcDateStr(new Date(now.getTime() - noteRevisionSnapshotTimeInterval * 1000));
const existingNoteRevisionId = sql.getValue( const existingNoteRevisionId = sql.getValue(
"SELECT noteRevisionId FROM note_revisions WHERE noteId = ? AND isErased = 0 AND utcDateCreated >= ?", [note.noteId, revisionCutoff]); "SELECT noteRevisionId FROM note_revisions WHERE noteId = ? AND utcDateCreated >= ?", [note.noteId, revisionCutoff]);
const msSinceDateCreated = now.getTime() - dateUtils.parseDateTime(note.utcDateCreated).getTime(); const msSinceDateCreated = now.getTime() - dateUtils.parseDateTime(note.utcDateCreated).getTime();
@@ -759,6 +759,8 @@ function duplicateSubtree(origNoteId, newParentNoteId) {
throw new Error('Duplicating root is not possible'); throw new Error('Duplicating root is not possible');
} }
log.info(`Duplicating ${origNote} subtree into ${newParentNoteId}`);
const origNote = repository.getNote(origNoteId); const origNote = repository.getNote(origNoteId);
// might be null if orig note is not in the target newParentNoteId // might be null if orig note is not in the target newParentNoteId
const origBranch = origNote.getBranches().find(branch => branch.parentNoteId === newParentNoteId); const origBranch = origNote.getBranches().find(branch => branch.parentNoteId === newParentNoteId);