Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-30 18:05:55 +01:00
Code Issues Packages Projects Releases Activity

sync / transaction fixes for recent notes

Browse Source
This commit is contained in:
azivner
2017-11-24 00:09:53 -05:00
parent 1a36daa088
commit f799d3076b
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

26
routes/api/recent_notes.js
View File

@@ -15,23 +15,29 @@ router.get('', auth.checkApiAuth, async (req, res, next) => {
router.put('/:notePath', auth.checkApiAuth, async (req, res, next) => { router.put('/:notePath', auth.checkApiAuth, async (req, res, next) => {
const notePath = req.params.notePath; const notePath = req.params.notePath;
await sql.replace('recent_notes', { await sql.doInTransaction(async() => {
note_path: notePath, await sql.replace('recent_notes', {
date_accessed: utils.nowTimestamp(), note_path: notePath,
is_deleted: 0 date_accessed: utils.nowTimestamp(),
is_deleted: 0
});
await sync_table.addRecentNoteSync(notePath);
await options.setOption('start_note_tree_id', notePath);
}); });
await sync_table.addRecentNoteSync(notePath);
await options.setOption('start_note_tree_id', notePath);
res.send(await getRecentNotes()); res.send(await getRecentNotes());
}); });
router.delete('/:notePath', auth.checkApiAuth, async (req, res, next) => { 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()); res.send(await getRecentNotes());
}); });