sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix consistency checks

pull/255/head
zadam 2021-12-27 13:37:51 +07:00
parent 8366a94bde
commit b8fe9a41db
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/services/consistency_checks.js
Unescape Escape View File

@ -259,7 +259,7 @@ class ConsistencyChecks {
WHERE noteId = ? WHERE noteId = ?
and parentNoteId = ? and parentNoteId = ?
and isDeleted = 0 and isDeleted = 0
ORDER BY utcDateCreated`, [noteId, parentNoteId]); ORDER BY utcDateModified`, [noteId, parentNoteId]);
const branches = branchIds.map(branchId => becca.getBranch(branchId)); const branches = branchIds.map(branchId => becca.getBranch(branchId));

4
src/services/import/zip.js
Unescape Escape View File

@ -240,6 +240,7 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
} }
if (noteMeta && noteMeta.isClone) { if (noteMeta && noteMeta.isClone) {
if (!becca.getBranchFromChildAndParent(noteId, parentNoteId)) {
new Branch({ new Branch({
noteId, noteId,
parentNoteId, parentNoteId,
@ -247,6 +248,7 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
prefix: noteMeta.prefix, prefix: noteMeta.prefix,
notePosition: noteMeta.notePosition notePosition: noteMeta.notePosition
}).save(); }).save();
}
return; return;
} }
@ -366,6 +368,7 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
note.setContent(content); note.setContent(content);
if (!becca.getBranchFromChildAndParent(noteId, parentNoteId)) {
new Branch({ new Branch({
noteId, noteId,
parentNoteId, parentNoteId,
@ -374,6 +377,7 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
notePosition: noteMeta.notePosition notePosition: noteMeta.notePosition
}).save(); }).save();
} }
}
else { else {
({note} = noteService.createNewNote({ ({note} = noteService.createNewNote({
parentNoteId: parentNoteId, parentNoteId: parentNoteId,