mirror of
https://github.com/zadam/trilium.git
synced 2025-11-01 10:55:55 +01:00
- changing note parent must change date_modified otherwise it will trigger a conflict
- when syncing note tree we don't overwrite is_expanded status
This commit is contained in:
@@ -38,6 +38,8 @@ async function updateNoteTree(entity, sourceId) {
|
||||
|
||||
if (orig === null || orig.date_modified < entity.date_modified) {
|
||||
await sql.doInTransaction(async () => {
|
||||
delete entity.is_expanded;
|
||||
|
||||
await sql.replace('notes_tree', entity);
|
||||
|
||||
await sql.addNoteTreeSync(entity.note_id, sourceId);
|
||||
|
||||
Reference in New Issue
Block a user