gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix setNoteToParent and deprecate it

Browse Source
This commit is contained in:
zadam 2019-11-10 19:29:51 +01:00
parent 0837cabb41
commit dea5195223
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/services/backend_script_api.js
View File

@ -282,9 +282,10 @@ function BackendScriptApi(currentNote, apiParams) {
* This method looks similar to toggleNoteInParent() but differs because we're looking up branch by prefix. * This method looks similar to toggleNoteInParent() but differs because we're looking up branch by prefix.
* *
* @method * @method
* @deprecated - this method is pretty confusing and serves specialized purpose only
* @param {string} noteId * @param {string} noteId
* @param {string} prefix * @param {string} prefix
* @param {string} [parentNoteId] * @param {string|null} parentNoteId
*/ */
this.setNoteToParent = treeService.setNoteToParent; this.setNoteToParent = treeService.setNoteToParent;

2
src/services/consistency_checks.js
View File

@ -195,7 +195,7 @@ async function findExistencyIssues() {
HAVING HAVING
COUNT(*) > 1`, COUNT(*) > 1`,
async ({noteId, parentNoteId}) => { async ({noteId, parentNoteId}) => {
const branches = await repository.getEntities(`SELECT * FROM branches WHERE noteId = ? and parentNoteId = ? and isDeleted = 1`, [noteId, parentNoteId]); const branches = await repository.getEntities(`SELECT * FROM branches WHERE noteId = ? and parentNoteId = ? and isDeleted = 0`, [noteId, parentNoteId]);
// it's not necessarily "original" branch, it's just the only one which will survive // it's not necessarily "original" branch, it's just the only one which will survive
const origBranch = branches[0]; const origBranch = branches[0];

23
src/services/tree.js
View File

@ -36,7 +36,7 @@ async function validateParentChild(parentNoteId, childNoteId, branchId = null) {
} }
async function getExistingBranch(parentNoteId, childNoteId) { async function getExistingBranch(parentNoteId, childNoteId) {
return await sql.getRow('SELECT * FROM branches WHERE noteId = ? AND parentNoteId = ? AND isDeleted = 0', [childNoteId, parentNoteId]); return await repository.getEntity('SELECT * FROM branches WHERE noteId = ? AND parentNoteId = ? AND isDeleted = 0', [childNoteId, parentNoteId]);
} }
/** /**
@ -123,6 +123,9 @@ async function sortNotesAlphabetically(parentNoteId, directoriesFirst = false) {
}); });
} }
/**
* @deprecated - this will be removed in the future
*/
async function setNoteToParent(noteId, prefix, parentNoteId) { async function setNoteToParent(noteId, prefix, parentNoteId) {
const parentNote = await repository.getNote(parentNoteId); const parentNote = await repository.getNote(parentNoteId);
@ -151,11 +154,19 @@ async function setNoteToParent(noteId, prefix, parentNoteId) {
throw new Error(`Cannot create a branch for ${noteId} which is deleted.`); throw new Error(`Cannot create a branch for ${noteId} which is deleted.`);
} }
await new Branch({ const branch = await repository.getEntity('SELECT * FROM branches WHERE isDeleted = 0 AND noteId = ? AND parentNoteId = ?', [noteId, parentNoteId]);
noteId: noteId,
parentNoteId: parentNoteId, if (branch) {
prefix: prefix branch.prefix = prefix;
}).save(); await branch.save();
}
else {
await new Branch({
noteId: noteId,
parentNoteId: parentNoteId,
prefix: prefix
}).save();
}
} }
} }