Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-10 15:25:51 +01:00
Code Issues Packages Projects Releases Activity

Merge branch 'stable'

Browse Source 
# Conflicts:
#	src/routes/api/revisions.js
#	src/services/bulk_actions.js
This commit is contained in:
zadam
2023-12-11 23:07:15 +01:00
parent c35167f2f5 0ac397e7ff
commit df85a5eee4
10 changed files with 40 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/routes/api/revisions.js
View File

@@ -8,6 +8,7 @@ const cls = require('../../services/cls.js');
const path = require('path');
const becca = require('../../becca/becca.js');
const blobService = require('../../services/blob.js');
const eraseService = require("../../services/erase.js");
function getRevisionBlob(req) {
const preview = req.query.preview === 'true';
@@ -88,11 +89,11 @@ function eraseAllRevisions(req) {
const revisionIdsToErase = sql.getColumn('SELECT revisionId FROM revisions WHERE noteId = ?',
[req.params.noteId]);
revisionService.eraseRevisions(revisionIdsToErase);
eraseService.eraseRevisions(revisionIdsToErase);
}
function eraseRevision(req) {
revisionService.eraseRevisions([req.params.revisionId]);
eraseService.eraseRevisions([req.params.revisionId]);
}
function restoreRevision(req) {