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

becca conversion WIP

Browse Source
This commit is contained in:
zadam
2021-05-02 19:59:16 +02:00
parent 77eac8f764
commit 273d4e0052
23 changed files with 136 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/services/notes.js
View File

@@ -6,11 +6,8 @@ const entityChangesService = require('./entity_changes.js');
const eventService = require('./events');
const repository = require('./repository');
const cls = require('../services/cls');
const Note = require('../entities/note');
const BeccaNote = require('../services/becca/entities/note.js');
const Branch = require('../entities/branch');
const BeccaBranch = require('../services/becca/entities/branch.js');
const Attribute = require('../entities/attribute');
const BeccaAttribute = require('../services/becca/entities/attribute.js');
const protectedSessionService = require('../services/protected_session');
const log = require('../services/log');
@@ -617,14 +614,14 @@ function undeleteBranch(branch, deleteId, taskContext) {
note.isDeleted = false;
note.save();
const attrs = repository.getEntities(`
SELECT * FROM attributes
const attributeIds = sql.getColumn(`
SELECT attributeId FROM attributes
WHERE isDeleted = 1
AND deleteId = ?
AND (noteId = ?
OR (type = 'relation' AND value = ?))`, [deleteId, note.noteId, note.noteId]);
for (const attr of attrs) {
for (const attr of attributeIds) {
attr.isDeleted = false;
attr.save();
}
@@ -646,14 +643,16 @@ function undeleteBranch(branch, deleteId, taskContext) {
* @return return deleted branches of an undeleted parent note
*/
function getUndeletedParentBranches(noteId, deleteId) {
return repository.getEntities(`
SELECT branches.*
const branchIds = sql.getColumn(`
SELECT branches.branchId
FROM branches
JOIN notes AS parentNote ON parentNote.noteId = branches.parentNoteId
WHERE branches.noteId = ?
AND branches.isDeleted = 1
AND branches.deleteId = ?
AND parentNote.isDeleted = 0`, [noteId, deleteId]);
return branchIds.map(branchId => becca.getBranch(branchId));
}
function scanForLinks(note) {