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

fixes

Browse Source
This commit is contained in:
azivner
2018-05-30 23:18:56 -04:00
parent bd66b8a1c8
commit 8bf4633cd0
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/routes/api/import.js
View File

@@ -33,6 +33,10 @@ async function importToBranch(req) {
} }
function toHtml(text) { function toHtml(text) {
if (!text) {
return '';
}
return '<p>' + text.replace(/(?:\r\n|\r|\n)/g, '</p><p>') + '</p>'; return '<p>' + text.replace(/(?:\r\n|\r|\n)/g, '</p><p>') + '</p>';
} }

2
src/routes/api/tree.js
View File

@@ -56,7 +56,7 @@ async function load(req) {
const branchIds = req.body.branchIds; const branchIds = req.body.branchIds;
if (branchIds && branchIds.length > 0) { if (branchIds && branchIds.length > 0) {
noteIds = (await sql.getColumn(`SELECT noteId FROM branches WHERE isDeleted = 0 AND branchId IN(???)`, branchIds)) noteIds = (await sql.getManyRows(`SELECT noteId FROM branches WHERE isDeleted = 0 AND branchId IN(???)`, branchIds))
.map(note => note.noteId); .map(note => note.noteId);
} }