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

Merge remote-tracking branch 'origin/stable' into m43

Browse Source 
# Conflicts:
#	.idea/dataSources.xml
This commit is contained in:
zadam
2020-05-19 23:20:32 +02:00
parent b72dc977e6 58f4f5d1e6
commit ef37bc1a99
9 changed files with 127 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/routes/api/export.js
View File

@@ -11,6 +11,14 @@ async function exportBranch(req, res) {
const {branchId, type, format, version, taskId} = req.params;
const branch = await repository.getBranch(branchId);
if (!branch) {
const message = `Cannot export branch ${branchId} since it does not exist.`;
log.error(message);
res.status(500).send(message);
return;
}
const taskContext = new TaskContext(taskId, 'export');
try {
@@ -39,4 +47,4 @@ async function exportBranch(req, res) {
module.exports = {
exportBranch
};
};