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

make sure the sorted branches are still sorted after drag & drop, #2142

Browse Source
This commit is contained in:
zadam
2021-09-02 23:21:02 +02:00
parent 167d4816fd
commit 6e300c7cf5
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/routes/api/branches.js
View File

@@ -85,8 +85,6 @@ function moveBranchBeforeNote(req) {
}
}
entityChangesService.addNoteReorderingEntityChange(beforeBranch.parentNoteId);
if (branchToMove.parentNoteId === beforeBranch.parentNoteId) {
branchToMove.notePosition = originalBeforeNotePosition;
branchToMove.save();
@@ -98,6 +96,13 @@ function moveBranchBeforeNote(req) {
branchToMove.markAsDeleted();
}
if (parentNote.hasLabel('sorted')) {
treeService.sortNotesByTitle(parentNote.noteId, false, false);
}
else {
entityChangesService.addNoteReorderingEntityChange(parentNote.noteId);
}
return { success: true };
}
@@ -129,8 +134,6 @@ function moveBranchAfterNote(req) {
}
}
entityChangesService.addNoteReorderingEntityChange(afterNote.parentNoteId);
const movedNotePosition = originalAfterNotePosition + 10;
if (branchToMove.parentNoteId === afterNote.parentNoteId) {
@@ -144,6 +147,13 @@ function moveBranchAfterNote(req) {
branchToMove.markAsDeleted();
}
if (parentNote.hasLabel('sorted')) {
treeService.sortNotesByTitle(parentNote.noteId, false, false);
}
else {
entityChangesService.addNoteReorderingEntityChange(parentNote.noteId);
}
return { success: true };
}