gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix notePosition assignment for new children of root

Browse Source
This commit is contained in:
zadam 2023-06-19 00:29:36 +02:00
parent 691fccb769
commit 5905950c17
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
db/migrations/0214__fix_root_children_ordering.sql Normal file
View File

@ -0,0 +1 @@
UPDATE branches SET notePosition = notePosition - 999899999 WHERE parentNoteId = 'root' AND notePosition > 999999999;

2
src/services/app_info.js
View File

@ -4,7 +4,7 @@ const build = require('./build');
const packageJson = require('../../package'); const packageJson = require('../../package');
const {TRILIUM_DATA_DIR} = require('./data_dir'); const {TRILIUM_DATA_DIR} = require('./data_dir');
const APP_DB_VERSION = 213; const APP_DB_VERSION = 214;
const SYNC_VERSION = 29; const SYNC_VERSION = 29;
const CLIPPER_PROTOCOL_VERSION = "1.0"; const CLIPPER_PROTOCOL_VERSION = "1.0";

2
src/services/notes.js
View File

@ -26,11 +26,13 @@ const fs = require("fs");
function getNewNotePosition(parentNote) { function getNewNotePosition(parentNote) {
if (parentNote.isLabelTruthy('newNotesOnTop')) { if (parentNote.isLabelTruthy('newNotesOnTop')) {
const minNotePos = parentNote.getChildBranches() const minNotePos = parentNote.getChildBranches()
.filter(branch => branch.noteId !== '_hidden') // has "always last" note position
.reduce((min, note) => Math.min(min, note.notePosition), 0); .reduce((min, note) => Math.min(min, note.notePosition), 0);
return minNotePos - 10; return minNotePos - 10;
} else { } else {
const maxNotePos = parentNote.getChildBranches() const maxNotePos = parentNote.getChildBranches()
.filter(branch => branch.noteId !== '_hidden') // has "always last" note position
.reduce((max, note) => Math.max(max, note.notePosition), 0); .reduce((max, note) => Math.max(max, note.notePosition), 0);
return maxNotePos + 10; return maxNotePos + 10;