From 2cc4367b371831b05ede4043866c91c91e78ed6c Mon Sep 17 00:00:00 2001 From: zadam Date: Fri, 15 Oct 2021 21:37:16 +0200 Subject: [PATCH] fix restoring note revision, closes #2232 --- src/becca/becca.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/becca/becca.js b/src/becca/becca.js index f78186061..ecd6babce 100644 --- a/src/becca/becca.js +++ b/src/becca/becca.js @@ -1,8 +1,6 @@ "use strict"; const sql = require("../services/sql.js"); -const NoteRevision = require("./entities/note_revision.js"); -const RecentNote = require("./entities/recent_note.js"); const NoteSet = require("../services/search/note_set"); class Becca { @@ -102,6 +100,7 @@ class Becca { getNoteRevision(noteRevisionId) { const row = sql.getRow("SELECT * FROM note_revisions WHERE noteRevisionId = ?", [noteRevisionId]); + const NoteRevision = require("./entities/note_revision.js"); // avoiding circular dependency problems return row ? new NoteRevision(row) : null; } @@ -131,12 +130,14 @@ class Becca { getRecentNotesFromQuery(query, params = []) { const rows = sql.getRows(query, params); + const RecentNote = require("./entities/recent_note.js"); // avoiding circular dependency problems return rows.map(row => new RecentNote(row)); } getNoteRevisionsFromQuery(query, params = []) { const rows = sql.getRows(query, params); + const NoteRevision = require("./entities/note_revision.js"); // avoiding circular dependency problems return rows.map(row => new NoteRevision(row)); }