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

Merge remote-tracking branch 'origin/stable' into redesign

Browse Source 
# Conflicts:
#	package-lock.json
#	package.json
This commit is contained in:
zadam
2021-05-26 21:27:06 +02:00
parent 58d61800f3 b9639bffce
commit 205f9953f9
7 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/services/import/zip.js
View File

@@ -307,6 +307,14 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
return `href="#root/${targetNoteId}"`;
});
content = content.replace(/data-note-path="([^"]*)"/g, (match, notePath) => {
const noteId = notePath.split("/").pop();
const targetNoteId = noteIdMap[noteId];
return `data-note-path="root/${targetNoteId}"`;
});
if (noteMeta) {
const includeNoteLinks = (noteMeta.attributes || [])
.filter(attr => attr.type === 'relation' && attr.name === 'includeNoteLink');