diff --git a/src/notes.py b/src/notes.py index c734185af..7635f4b3e 100644 --- a/src/notes.py +++ b/src/notes.py @@ -12,14 +12,25 @@ class Notes(Resource): def get(self, note_id): execute("update options set opt_value = ? where opt_name = 'start_node'", [note_id]) + detail = getSingleResult("select * from notes where note_id = ?", [note_id]) + + if detail['note_clone_id']: + note_id = detail['note_clone_id'] + detail = getSingleResult("select * from notes where note_id = ?", [note_id]) + return { - 'detail': getSingleResult("select * from notes where note_id = ?", [note_id]), + 'detail': detail, 'formatting': getResults("select * from formatting where note_id = ? order by note_offset", [note_id]), 'links': getResults("select * from links where note_id = ? order by note_offset", [note_id]), 'images': getResults("select * from images where note_id = ? order by note_offset", [note_id]) } def put(self, note_id): + detail = getSingleResult("select * from notes where note_id = ?", [note_id]) + + if detail['note_clone_id']: + note_id = detail['note_clone_id'] + note = request.get_json(force=True) now = math.floor(time.time()) diff --git a/static/js/html2notecase.js b/static/js/html2notecase.js index 25f191705..881f0f2e0 100644 --- a/static/js/html2notecase.js +++ b/static/js/html2notecase.js @@ -133,8 +133,8 @@ function html2notecase(contents, note) { lnk_text: linkMatch[0] }); - console.log(linkMatch[0]); - console.log(linkMatch[0].length); + // console.log(linkMatch[0]); + // console.log(linkMatch[0].length); index += linkMatch[0].length; } diff --git a/static/js/note.js b/static/js/note.js index 26c2a1128..71086c750 100644 --- a/static/js/note.js +++ b/static/js/note.js @@ -42,14 +42,12 @@ function saveNoteIfChanged(callback) { note.detail.note_title = title; - const note_id = note.detail.is_clone ? note.detail.note_clone_id : note.detail.note_id; - $.ajax({ - url: baseUrl + 'notes/' + note_id, + url: baseUrl + 'notes/' + note.detail.note_id, type: 'PUT', data: JSON.stringify(note), contentType: "application/json", - success: function(result) { + success: function() { isNoteChanged = false; message("Saved!"); @@ -58,7 +56,7 @@ function saveNoteIfChanged(callback) { callback(); } }, - error: function(result) { + error: function() { error("Error saving the note!"); } }); diff --git a/static/js/tree.js b/static/js/tree.js index b3da5acec..6008a2773 100644 --- a/static/js/tree.js +++ b/static/js/tree.js @@ -135,9 +135,8 @@ $(function(){ source: notes, activate: function(event, data){ const node = data.node.data; - const noteId = node.is_clone ? node.note_clone_id : node.note_id; - saveNoteIfChanged(() => loadNote(noteId)); + saveNoteIfChanged(() => loadNote(node.note_id)); }, expand: function(event, data) { setExpanded(data.node.key, true);