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

refactoring of note deletion

Browse Source
This commit is contained in:
azivner
2018-03-31 23:08:22 -04:00
parent 4f200c73dc
commit 12439d8761
9 changed files with 46 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/entities/note.js
View File

@@ -84,11 +84,11 @@ class Note extends Entity {
return await repository.getEntities("SELECT * FROM note_images WHERE noteId = ? AND isDeleted = 0", [this.noteId]);
}
async getTrees() {
async getBranches() {
return await repository.getEntities("SELECT * FROM branches WHERE isDeleted = 0 AND noteId = ?", [this.noteId]);
}
async getChild(name) {
async getChildNote(name) {
return await repository.getEntity(`
SELECT notes.*
FROM branches
@@ -99,7 +99,7 @@ class Note extends Entity {
AND notes.title = ?`, [this.noteId, name]);
}
async getChildren() {
async getChildNotes() {
return await repository.getEntities(`
SELECT notes.*
FROM branches
@@ -110,7 +110,16 @@ class Note extends Entity {
ORDER BY branches.notePosition`, [this.noteId]);
}
async getParents() {
async getChildBranches() {
return await repository.getEntities(`
SELECT branches.*
FROM branches
WHERE branches.isDeleted = 0
AND branches.parentNoteId = ?
ORDER BY branches.notePosition`, [this.noteId]);
}
async getParentNotes() {
return await repository.getEntities(`
SELECT parent_notes.*
FROM
@@ -121,16 +130,6 @@ class Note extends Entity {
AND parent_notes.isDeleted = 0`, [this.noteId]);
}
async getBranch() {
return await repository.getEntities(`
SELECT branches.*
FROM branches
JOIN notes USING(noteId)
WHERE notes.isDeleted = 0
AND branches.isDeleted = 0
AND branches.noteId = ?`, [this.noteId]);
}
beforeSaving() {
if (this.isJson()) {
this.content = JSON.stringify(this.jsonContent, null, '\t');