Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-11 15:55:52 +01:00
Code Issues Packages Projects Releases Activity

Merge branch 'master' into next61

Browse Source 
# Conflicts:
#	package-lock.json
#	package.json
#	src/public/app/entities/fnote.js
#	src/public/app/services/link.js
This commit is contained in:
zadam
2023-05-28 16:57:48 +02:00
parent 8e913cb453 bf6106f4dc
commit c2f70031d0
6 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/routes/api/note_revisions.js
View File

@@ -148,15 +148,15 @@ function getEditedNotesOnDate(req) {
notes = notes.filter(note => note.hasAncestor(hoistedNoteId));
}
notes = notes.map(note => note.getPojo());
for (const note of notes) {
return notes.map(note => {
const notePath = note.isDeleted ? null : getNotePathData(note);
note.notePath = notePath ? notePath.notePath : null;
}
const notePojo = note.getPojo();
notePojo.notePath = notePath ? notePath.notePath : null;
return notePojo;
});
return notes;
}
function getNotePathData(note) {