From a810c08c0209ee0a541d244ed8346d85fdd3cb53 Mon Sep 17 00:00:00 2001 From: zadam Date: Wed, 8 Dec 2021 21:04:22 +0100 Subject: [PATCH 1/3] trigger note revisioning saving also on title changes #2426 --- src/public/app/dialogs/options/other.js | 10 +++++----- src/routes/api/notes.js | 4 ++++ src/services/notes.js | 3 ++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/public/app/dialogs/options/other.js b/src/public/app/dialogs/options/other.js index 99bde91ec..30ef661b6 100644 --- a/src/public/app/dialogs/options/other.js +++ b/src/public/app/dialogs/options/other.js @@ -30,7 +30,7 @@ const TPL = `
- +
@@ -67,7 +67,7 @@ const TPL = `
- +
@@ -78,7 +78,7 @@ const TPL = `
- +
@@ -89,12 +89,12 @@ const TPL = `
- +
- +
`; diff --git a/src/routes/api/notes.js b/src/routes/api/notes.js index d1d0c333c..63ddc375b 100644 --- a/src/routes/api/notes.js +++ b/src/routes/api/notes.js @@ -203,6 +203,10 @@ function changeTitle(req) { const noteTitleChanged = note.title !== title; + if (noteTitleChanged) { + noteService.saveNoteRevision(note); + } + note.title = title; note.save(); diff --git a/src/services/notes.js b/src/services/notes.js index 2b889793b..4dee6eb2b 100644 --- a/src/services/notes.js +++ b/src/services/notes.js @@ -918,5 +918,6 @@ module.exports = { getUndeletedParentBranchIds, triggerNoteTitleChanged, eraseDeletedNotesNow, - eraseNotesWithDeleteId + eraseNotesWithDeleteId, + saveNoteRevision }; From d9550dd59b9b0dff0b229c400cdf6585abcb226a Mon Sep 17 00:00:00 2001 From: zadam Date: Sat, 11 Dec 2021 14:15:38 +0100 Subject: [PATCH 2/3] fix "getNoteStartingWith" relic --- src/services/date_notes.js | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/services/date_notes.js b/src/services/date_notes.js index 7d9940690..a7eee8356 100644 --- a/src/services/date_notes.js +++ b/src/services/date_notes.js @@ -56,8 +56,7 @@ function getYearNote(dateStr, rootNote) { const yearStr = dateStr.substr(0, 4); - let yearNote = attributeService.getNoteWithLabel(YEAR_LABEL, yearStr) - || getNoteStartingWith(rootNote.noteId, yearStr); + let yearNote = attributeService.getNoteWithLabel(YEAR_LABEL, yearStr); if (yearNote) { return yearNote; @@ -103,18 +102,12 @@ function getMonthNote(dateStr, rootNote) { return monthNote; } - const yearNote = getYearNote(dateStr, rootNote); - - monthNote = getNoteStartingWith(yearNote.noteId, monthNumber); - - if (monthNote) { - return monthNote; - } - const dateObj = dateUtils.parseLocalDate(dateStr); const noteTitle = getMonthNoteTitle(rootNote, monthNumber, dateObj); + const yearNote = getYearNote(dateStr, rootNote); + sql.transactional(() => { monthNote = createNote(yearNote, noteTitle); From a81ea3771f268e8fc2b47a9fa0ac4a1b8c5b081e Mon Sep 17 00:00:00 2001 From: zadam Date: Mon, 13 Dec 2021 11:12:31 +0100 Subject: [PATCH 3/3] release 0.48.8 --- package.json | 2 +- src/services/build.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a8bb5d57f..743c6d0fb 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "trilium", "productName": "Trilium Notes", "description": "Trilium Notes", - "version": "0.48.7", + "version": "0.48.8", "license": "AGPL-3.0-only", "main": "electron.js", "bin": { diff --git a/src/services/build.js b/src/services/build.js index 63eb5c7a9..f8b88d795 100644 --- a/src/services/build.js +++ b/src/services/build.js @@ -1 +1 @@ -module.exports = { buildDate:"2021-11-23T21:53:32+01:00", buildRevision: "24210ef80c8585b64a00cd5316ae1c1563e0c9f7" }; +module.exports = { buildDate:"2021-12-13T11:12:31+01:00", buildRevision: "d9550dd59b9b0dff0b229c400cdf6585abcb226a" };