Merge remote-tracking branch 'origin/stable'

This commit is contained in:
zadam
2020-11-19 21:42:49 +01:00
9 changed files with 101 additions and 27 deletions

View File

@@ -187,10 +187,10 @@ function changeTitle(req) {
return note;
}
function duplicateNote(req) {
function duplicateSubtree(req) {
const {noteId, parentNoteId} = req.params;
return noteService.duplicateNote(noteId, parentNoteId);
return noteService.duplicateSubtree(noteId, parentNoteId);
}
module.exports = {
@@ -204,5 +204,5 @@ module.exports = {
setNoteTypeMime,
getRelationMap,
changeTitle,
duplicateNote
duplicateSubtree
};

View File

@@ -154,7 +154,7 @@ function register(app) {
apiRoute(PUT, '/api/notes/:noteId/restore-revision/:noteRevisionId', noteRevisionsApiRoute.restoreNoteRevision);
apiRoute(POST, '/api/notes/relation-map', notesApiRoute.getRelationMap);
apiRoute(PUT, '/api/notes/:noteId/change-title', notesApiRoute.changeTitle);
apiRoute(POST, '/api/notes/:noteId/duplicate/:parentNoteId', notesApiRoute.duplicateNote);
apiRoute(POST, '/api/notes/:noteId/duplicate/:parentNoteId', notesApiRoute.duplicateSubtree);
apiRoute(GET, '/api/edited-notes/:date', noteRevisionsApiRoute.getEditedNotesOnDate);