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

allow specifiyng sorted attribute (including off for overriding), #2142

Browse Source
This commit is contained in:
zadam
2021-09-03 22:33:40 +02:00
parent 6e300c7cf5
commit 5cfd1c030d
7 changed files with 58 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,12 +96,10 @@ function moveBranchBeforeNote(req) {
branchToMove.markAsDeleted();
}
if (parentNote.hasLabel('sorted')) {
treeService.sortNotesByTitle(parentNote.noteId, false, false);
}
else {
entityChangesService.addNoteReorderingEntityChange(parentNote.noteId);
}
treeService.sortNotesIfNeeded(parentNote.noteId);
// if sorting is not needed then still the ordering might have changed above manually
entityChangesService.addNoteReorderingEntityChange(parentNote.noteId);
return { success: true };
}
@@ -147,12 +145,10 @@ function moveBranchAfterNote(req) {
branchToMove.markAsDeleted();
}
if (parentNote.hasLabel('sorted')) {
treeService.sortNotesByTitle(parentNote.noteId, false, false);
}
else {
entityChangesService.addNoteReorderingEntityChange(parentNote.noteId);
}
treeService.sortNotesIfNeeded(parentNote.noteId);
// if sorting is not needed then still the ordering might have changed above manually
entityChangesService.addNoteReorderingEntityChange(parentNote.noteId);
return { success: true };
}

7
src/routes/api/notes.js
View File

@@ -97,12 +97,7 @@ function sortChildNotes(req) {
const reverse = sortDirection === 'desc';
if (sortBy === 'title') {
treeService.sortNotesByTitle(noteId, false, reverse);
}
else {
treeService.sortNotes(noteId, sortBy, reverse);
}
treeService.sortNotes(noteId, sortBy, reverse);
}
function protectNote(req) {