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

Merge remote-tracking branch 'upstream/master' into feature/port_0.63.7

Browse Source 
; Conflicts:
;	package-lock.json
;	src/routes/api/files.ts
;	src/services/build.js
;	src/services/notes.ts
This commit is contained in:
Elian Doran
2024-07-13 18:36:04 +03:00
parent e7c3dab56f 82a437f2a8
commit d5c1bd1085
15 changed files with 74 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/services/build.ts
View File

@@ -1 +1 @@
export = { buildDate:"2024-03-28T07:11:39+01:00", buildRevision: "399458b52f250b22be22d980a78de0b3390d7521" };
export = { buildDate:"2024-05-18T06:17:21+02:00", buildRevision: "c7f19e04fafc031910f6f9a45d2015387618e902" };

16
src/services/notes.ts
View File

@@ -446,13 +446,17 @@ function findIncludeNoteLinks(content: string, foundLinks: FoundLink[]) {
}
function findRelationMapLinks(content: string, foundLinks: FoundLink[]) {
const obj = JSON.parse(content);
try {
const obj = JSON.parse(content);
for (const note of obj.notes) {
foundLinks.push({
name: 'relationMapLink',
value: note.noteId
});
for (const note of obj.notes) {
foundLinks.push({
name: 'relationMapLink',
value: note.noteId
});
}
} catch (e: any) {
log.error("Could not scan for relation map links: " + e.message);
}
}