zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-02-25 15:35:43 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'stable'

Browse source 
# Conflicts:
#	src/routes/api/files.js
#	src/routes/api/note_revisions.js
#	src/routes/api/notes.js
#	src/services/image.js
This commit is contained in:
zadam 2022-06-13 23:04:54 +02:00
commit d3ee0aa8a8
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/services/note_revisions.js
View file

@ -1,9 +1,8 @@
"use strict"; "use strict";
const NoteRevision = require('../becca/entities/note_revision');
const dateUtils = require('./date_utils');
const log = require('./log'); const log = require('./log');
const sql = require('./sql'); const sql = require('./sql');
const protectedSession = require("./protected_session");
/** /**
* @param {Note} note * @param {Note} note
@ -11,6 +10,12 @@ const sql = require('./sql');
function protectNoteRevisions(note) { function protectNoteRevisions(note) {
for (const revision of note.getNoteRevisions()) { for (const revision of note.getNoteRevisions()) {
if (note.isProtected !== revision.isProtected) { if (note.isProtected !== revision.isProtected) {
if (!protectedSession.isProtectedSessionAvailable()) {
log.error("Protected session is not available to fix note revisions.");
return;
}
try { try {
const content = revision.getContent(); const content = revision.getContent();