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

renamed dates in code as well

Browse Source
This commit is contained in:
zadam
2019-03-12 20:58:31 +01:00
parent f65fefe7b1
commit 1c41d459f0
29 changed files with 92 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,7 +48,7 @@ async function moveBranchBeforeNote(req) {
return [200, validationResult];
}
// we don't change dateModified so other changes are prioritized in case of conflict
// we don't change utcDateModified so other changes are prioritized in case of conflict
// also we would have to sync all those modified branches otherwise hash checks would fail
await sql.execute("UPDATE branches SET notePosition = notePosition + 1 WHERE parentNoteId = ? AND notePosition >= ? AND isDeleted = 0",
[beforeNote.parentNoteId, beforeNote.notePosition]);
@@ -76,7 +76,7 @@ async function moveBranchAfterNote(req) {
return [200, validationResult];
}
// we don't change dateModified so other changes are prioritized in case of conflict
// we don't change utcDateModified so other changes are prioritized in case of conflict
// also we would have to sync all those modified branches otherwise hash checks would fail
await sql.execute("UPDATE branches SET notePosition = notePosition + 1 WHERE parentNoteId = ? AND notePosition > ? AND isDeleted = 0",
[afterNote.parentNoteId, afterNote.notePosition]);