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

Merge branch 'master' into canvas

Browse Source
This commit is contained in:
azivner
2018-10-23 18:11:29 +02:00
parent 6559e6c25b 9f0860edab
commit b17f442d1f
10 changed files with 56 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,7 @@ async function moveBranchToParent(req) {
const validationResult = await tree.validateParentChild(parentNoteId, noteToMove.noteId, branchId);
if (!validationResult.success) {
return [400, validationResult];
return [200, validationResult];
}
const maxNotePos = await sql.getValue('SELECT MAX(notePosition) FROM branches WHERE parentNoteId = ? AND isDeleted = 0', [parentNoteId]);
@@ -45,7 +45,7 @@ async function moveBranchBeforeNote(req) {
const validationResult = await tree.validateParentChild(beforeNote.parentNoteId, noteToMove.noteId, branchId);
if (!validationResult.success) {
return [400, validationResult];
return [200, validationResult];
}
// we don't change dateModified so other changes are prioritized in case of conflict
@@ -73,7 +73,7 @@ async function moveBranchAfterNote(req) {
const validationResult = await tree.validateParentChild(afterNote.parentNoteId, noteToMove.noteId, branchId);
if (!validationResult.success) {
return [400, validationResult];
return [200, validationResult];
}
// we don't change dateModified so other changes are prioritized in case of conflict