gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix note sorting with sync - deleted note trees should not be sorted

Browse Source
This commit is contained in:
azivner 2018-01-17 20:19:41 -05:00
parent b642a567bb
commit 651a9fb327
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/reddit.js
View File

@ -34,7 +34,8 @@ function redditId(kind, id) {
async function getNoteStartingWith(parentNoteId, startsWith) { async function getNoteStartingWith(parentNoteId, startsWith) {
return await sql.getFirstValue(`SELECT note_id FROM notes JOIN notes_tree USING(note_id) return await sql.getFirstValue(`SELECT note_id FROM notes JOIN notes_tree USING(note_id)
WHERE parent_note_id = ? AND note_title LIKE '${startsWith}%' WHERE parent_note_id = ? AND note_title LIKE '${startsWith}%'
AND notes.is_deleted = 0 AND notes_tree.is_deleted = 0`, [parentNoteId]); AND notes.is_deleted = 0 AND is_protected = 0
AND notes_tree.is_deleted = 0`, [parentNoteId]);
} }
async function getRootNoteId() { async function getRootNoteId() {

3
services/tree.js
View File

@ -83,7 +83,8 @@ async function loadSubTreeNoteIds(parentNoteId, subTreeNoteIds) {
async function sortNotesAlphabetically(parentNoteId, dataKey, sourceId) { async function sortNotesAlphabetically(parentNoteId, dataKey, sourceId) {
await sql.doInTransaction(async () => { await sql.doInTransaction(async () => {
const notes = await sql.getAll(`SELECT note_tree_id, note_id, note_title, is_protected const notes = await sql.getAll(`SELECT note_tree_id, note_id, note_title, is_protected
FROM notes JOIN notes_tree USING(note_id) WHERE parent_note_id = ?`, [parentNoteId]); FROM notes JOIN notes_tree USING(note_id)
WHERE notes_tree.is_deleted = 0 AND parent_note_id = ?`, [parentNoteId]);
for (const note of notes) { for (const note of notes) {
if (note.is_protected) { if (note.is_protected) {