mirror of
https://github.com/zadam/trilium.git
synced 2025-06-06 18:08:33 +02:00
fix restoring note revision, closes #2232
This commit is contained in:
parent
241d1b1035
commit
2cc4367b37
@ -1,8 +1,6 @@
|
|||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
const sql = require("../services/sql.js");
|
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");
|
const NoteSet = require("../services/search/note_set");
|
||||||
|
|
||||||
class Becca {
|
class Becca {
|
||||||
@ -102,6 +100,7 @@ class Becca {
|
|||||||
getNoteRevision(noteRevisionId) {
|
getNoteRevision(noteRevisionId) {
|
||||||
const row = sql.getRow("SELECT * FROM note_revisions WHERE noteRevisionId = ?", [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;
|
return row ? new NoteRevision(row) : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -131,12 +130,14 @@ class Becca {
|
|||||||
getRecentNotesFromQuery(query, params = []) {
|
getRecentNotesFromQuery(query, params = []) {
|
||||||
const rows = sql.getRows(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));
|
return rows.map(row => new RecentNote(row));
|
||||||
}
|
}
|
||||||
|
|
||||||
getNoteRevisionsFromQuery(query, params = []) {
|
getNoteRevisionsFromQuery(query, params = []) {
|
||||||
const rows = sql.getRows(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));
|
return rows.map(row => new NoteRevision(row));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user