Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-30 09:56:36 +01:00
Code Issues Packages Projects Releases Activity

fixes in import & export related to the protected session

Browse Source
This commit is contained in:
zadam
2019-09-01 22:09:55 +02:00
parent 8dadc7e518
commit 15a2fe2570
4 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/services/export/tar.js
View File

@@ -8,7 +8,7 @@ const mimeTypes = require('mime-types');
const TurndownService = require('turndown');
const packageInfo = require('../../../package.json');
const utils = require('../utils');
const log = require('../log');
const protectedSessionService = require('../protected_session');
const sanitize = require("sanitize-filename");
/**
@@ -136,8 +136,10 @@ async function exportToTar(exportContext, branch, format, res) {
const childBranches = await note.getChildBranches();
const available = !note.isProtected || protectedSessionService.isProtectedSessionAvailable();
// if it's a leaf then we'll export it even if it's empty
if ((await note.getContent()).length > 0 || childBranches.length === 0) {
if (available && ((await note.getContent()).length > 0 || childBranches.length === 0)) {
meta.dataFileName = getDataFileName(note, baseFileName, existingFileNames);
}