mirror of
https://github.com/zadam/trilium.git
synced 2024-09-21 16:16:04 +08:00
fixes
This commit is contained in:
parent
bd66b8a1c8
commit
8bf4633cd0
|
@ -33,6 +33,10 @@ async function importToBranch(req) {
|
|||
}
|
||||
|
||||
function toHtml(text) {
|
||||
if (!text) {
|
||||
return '';
|
||||
}
|
||||
|
||||
return '<p>' + text.replace(/(?:\r\n|\r|\n)/g, '</p><p>') + '</p>';
|
||||
}
|
||||
|
||||
|
|
|
@ -56,7 +56,7 @@ async function load(req) {
|
|||
const branchIds = req.body.branchIds;
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue