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

sync fixes

Browse Source
This commit is contained in:
azivner
2017-11-05 20:37:25 -05:00
parent ba24281f22
commit 2a9a8da045
4 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/notes.js
View File

@@ -37,6 +37,8 @@ async function createNewNote(parentNoteId, note, browserId) {
await sql.doInTransaction(async () => {
await sql.addAudit(audit_category.CREATE_NOTE, browserId, noteId);
await sql.addNoteTreeSync(noteId, browserId);
await sql.addNoteSync(noteId, browserId);
const now = utils.nowTimestamp();
@@ -127,25 +129,28 @@ async function updateNote(noteId, newNote, browserId) {
await sql.insert("links", link);
}
await sql.addNoteTreeSync(noteId);
await sql.addNoteSync(noteId);
});
}
async function addNoteAudits(origNote, newNote, browserId) {
const noteId = origNote.note_id;
const noteId = newNote.note_id;
if (newNote.note_title !== origNote.note_title) {
if (!origNote || newNote.note_title !== origNote.note_title) {
await sql.deleteRecentAudits(audit_category.UPDATE_TITLE, browserId, noteId);
await sql.addAudit(audit_category.UPDATE_TITLE, browserId, noteId);
}
if (newNote.note_text !== origNote.note_text) {
if (!origNote || newNote.note_text !== origNote.note_text) {
await sql.deleteRecentAudits(audit_category.UPDATE_CONTENT, browserId, noteId);
await sql.addAudit(audit_category.UPDATE_CONTENT, browserId, noteId);
}
if (newNote.encryption !== origNote.encryption) {
await sql.addAudit(audit_category.ENCRYPTION, browserId, noteId, origNote.encryption, newNote.encryption);
if (!origNote || newNote.encryption !== origNote.encryption) {
const origEncryption = origNote ? origNote.encryption : null;
await sql.addAudit(audit_category.ENCRYPTION, browserId, noteId, origEncryption, newNote.encryption);
}
}
@@ -162,6 +167,9 @@ async function deleteNote(noteId, browserId) {
await sql.execute("update notes_tree set is_deleted = 1, date_modified = ? where note_id = ?", [now, noteId]);
await sql.execute("update notes set is_deleted = 1, date_modified = ? where note_id = ?", [now, noteId]);
await sql.addNoteTreeSync(noteId, browserId);
await sql.addNoteSync(noteId, browserId);
await sql.addAudit(audit_category.DELETE_NOTE, browserId, noteId);
}