sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sync / transaction fixes for recent notes

pull/255/head
azivner 2017-11-24 00:09:53 +07:00
parent 1a36daa088
commit f799d3076b
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/javascripts/dialogs/recent_notes.js
Unescape Escape View File

@ -21,7 +21,7 @@ const recentNotes = (function() {
function addRecentNote(notePath) {
setTimeout(() => {
// we include the note into recent list only if the user stayed on the note at least 5 seconds
if (notePath === noteTree.getCurrentNotePath()) {
if (notePath && notePath === noteTree.getCurrentNotePath()) {
$.ajax({
url: baseApiUrl + 'recent-notes/' + encodeURIComponent(notePath),
type: 'PUT',

24
routes/api/recent_notes.js
Unescape Escape View File

@ -15,23 +15,29 @@ router.get('', auth.checkApiAuth, async (req, res, next) => {
router.put('/:notePath', auth.checkApiAuth, async (req, res, next) => {
const notePath = req.params.notePath;
await sql.replace('recent_notes', {
note_path: notePath,
date_accessed: utils.nowTimestamp(),
is_deleted: 0
});
await sql.doInTransaction(async() => {
await sql.replace('recent_notes', {
note_path: notePath,
date_accessed: utils.nowTimestamp(),
is_deleted: 0
});
await sync_table.addRecentNoteSync(notePath);
await sync_table.addRecentNoteSync(notePath);
await options.setOption('start_note_tree_id', notePath);
await options.setOption('start_note_tree_id', notePath);
});
res.send(await getRecentNotes());
});
router.delete('/:notePath', auth.checkApiAuth, async (req, res, next) => {
await sql.execute('UPDATE recent_notes SET is_deleted = 1 WHERE note_path = ?', [req.params.notePath]);
const notePath = req.params.notePath;
await sync_table.addRecentNoteSync(req.params.notePath);
await sql.doInTransaction(async() => {
await sql.execute('UPDATE recent_notes SET is_deleted = 1 WHERE note_path = ?', [notePath]);
await sync_table.addRecentNoteSync(notePath);
});
res.send(await getRecentNotes());
});