From 9b905563c3bd26d61b290da80a672dd70b58884c Mon Sep 17 00:00:00 2001 From: zadam Date: Thu, 7 Nov 2019 19:51:38 +0100 Subject: [PATCH 1/2] fix ensureNoteIsAbsentFromParent, closes #691 --- package-lock.json | 2 +- src/services/cloning.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1776ec92f..0d412af98 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "trilium", - "version": "0.36.2", + "version": "0.36.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/src/services/cloning.js b/src/services/cloning.js index b6ce69c69..0545ea240 100644 --- a/src/services/cloning.js +++ b/src/services/cloning.js @@ -6,6 +6,7 @@ const treeService = require('./tree'); const noteService = require('./notes'); const repository = require('./repository'); const Branch = require('../entities/branch'); +const TaskContext = require("./task_context.js"); async function cloneNoteToParent(noteId, parentNoteId, prefix) { if (await isNoteDeleted(noteId) || await isNoteDeleted(parentNoteId)) { @@ -53,7 +54,7 @@ async function ensureNoteIsAbsentFromParent(noteId, parentNoteId) { const branch = await repository.getEntity(`SELECT * FROM branches WHERE noteId = ? AND parentNoteId = ? AND isDeleted = 0`, [noteId, parentNoteId]); if (branch) { - await noteService.deleteBranch(branch); + await noteService.deleteBranch(branch, new TaskContext()); } } From 05547845cb6812c2a0a743a8c703faacdbe697c3 Mon Sep 17 00:00:00 2001 From: zadam Date: Thu, 7 Nov 2019 19:58:40 +0100 Subject: [PATCH 2/2] including confirm and prompt dialog to mobile frontend to allow deleting notes, closes #689 --- src/views/mobile.ejs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/mobile.ejs b/src/views/mobile.ejs index 83decb5dc..dd6a2ad7a 100644 --- a/src/views/mobile.ejs +++ b/src/views/mobile.ejs @@ -79,6 +79,7 @@ <% include dialogs/protected_session_password.ejs %> + <% include dialogs/confirm.ejs %>