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

added date_modified to notes_tree

Browse Source
This commit is contained in:
azivner
2017-10-22 22:56:42 -04:00
parent 3009c5e15e
commit a5bd4c7b6a
5 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/www
View File

@@ -1,5 +1,9 @@
#!/usr/bin/env node #!/usr/bin/env node
process.on('unhandledRejection', (reason, p) => {
// this makes sure that stacktrace of failed promise is printed out
console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
});
var app = require('../app'); var app = require('../app');
var debug = require('debug')('node:server'); var debug = require('debug')('node:server');

1
migrations/0004__add_date_modified_to_notes_tree.sql Normal file
View File

@@ -0,0 +1 @@
ALTER TABLE notes_tree ADD COLUMN date_modified INTEGER NOT NULL DEFAULT 0

7
routes/api/notes.js
View File

@@ -153,7 +153,9 @@ router.post('/:parentNoteId/children', async (req, res, next) => {
newNotePos = afterNote['note_pos'] + 1; newNotePos = afterNote['note_pos'] + 1;
await sql.execute('update notes_tree set note_pos = note_pos + 1 where note_pid = ? and note_pos > ?', [parentNoteId, afterNote['note_pos']]); const now = utils.nowTimestamp();
await sql.execute('update notes_tree set note_pos = note_pos + 1, date_modified = ? where note_pid = ? and note_pos > ?', [now, parentNoteId, afterNote['note_pos']]);
} }
else { else {
throw new ('Unknown target: ' + note['target']); throw new ('Unknown target: ' + note['target']);
@@ -179,7 +181,8 @@ router.post('/:parentNoteId/children', async (req, res, next) => {
'note_id': noteId, 'note_id': noteId,
'note_pid': parentNoteId, 'note_pid': parentNoteId,
'note_pos': newNotePos, 'note_pos': newNotePos,
'is_expanded': 0 'is_expanded': 0,
'date_modified': utils.nowTimestamp()
}); });
await sql.commit(); await sql.commit();

31
routes/api/notes_move.js
View File

@@ -20,9 +20,12 @@ router.put('/:noteId/moveTo/:parentId', auth.checkApiAuth, async (req, res, next
else else
newNotePos = maxNotePos + 1; newNotePos = maxNotePos + 1;
const now = utils.nowTimestamp();
await sql.beginTransaction(); await sql.beginTransaction();
await sql.execute("update notes_tree set note_pid = ?, note_pos = ? where note_id = ?", [parentId, newNotePos, noteId]); await sql.execute("update notes_tree set note_pid = ?, note_pos = ?, date_modified = ? where note_id = ?",
[parentId, newNotePos, now, noteId]);
await sql.addAudit(audit_category.CHANGE_PARENT, req, noteId); await sql.addAudit(audit_category.CHANGE_PARENT, req, noteId);
@@ -37,12 +40,15 @@ router.put('/:noteId/moveBefore/:beforeNoteId', async (req, res, next) => {
const beforeNote = await sql.getSingleResult("select * from notes_tree where note_id = ?", [beforeNoteId]); const beforeNote = await sql.getSingleResult("select * from notes_tree where note_id = ?", [beforeNoteId]);
if (beforeNote !== null) { if (beforeNote) {
const now = utils.nowTimestamp();
await sql.beginTransaction(); await sql.beginTransaction();
await sql.execute("update notes_tree set note_pos = note_pos + 1 where note_id = ?", [beforeNoteId]); await sql.execute("update notes_tree set note_pos = note_pos + 1, date_modified = ? where note_id = ?", [now, beforeNoteId]);
await sql.execute("update notes_tree set note_pid = ?, note_pos = ? where note_id = ?", [beforeNote['note_pid'], beforeNote['note_pos'], noteId]); await sql.execute("update notes_tree set note_pid = ?, note_pos = ?, date_modified = ? where note_id = ?",
[beforeNote['note_pid'], beforeNote['note_pos'], now, noteId]);
await sql.addAudit(audit_category.CHANGE_POSITION, req, noteId); await sql.addAudit(audit_category.CHANGE_POSITION, req, noteId);
@@ -58,12 +64,16 @@ router.put('/:noteId/moveAfter/:afterNoteId', async (req, res, next) => {
const afterNote = await sql.getSingleResult("select * from notes_tree where note_id = ?", [afterNoteId]); const afterNote = await sql.getSingleResult("select * from notes_tree where note_id = ?", [afterNoteId]);
if (afterNote !== null) { if (afterNote) {
const now = utils.nowTimestamp();
await sql.beginTransaction(); await sql.beginTransaction();
await sql.execute("update notes_tree set note_pos = note_pos + 1 where note_pid = ? and note_pos > ?", [afterNote['note_pid'], afterNote['note_pos']]); await sql.execute("update notes_tree set note_pos = note_pos + 1, date_modified = ? where note_pid = ? and note_pos > ?",
[now, afterNote['note_pid'], afterNote['note_pos']]);
await sql.execute("update notes_tree set note_pid = ?, note_pos = ? where note_id = ?", [afterNote['note_pid'], afterNote['note_pos'] + 1, noteId]); await sql.execute("update notes_tree set note_pid = ?, note_pos = ?, date_modified = ? where note_id = ?",
[afterNote['note_pid'], afterNote['note_pos'] + 1, now, noteId]);
await sql.addAudit(audit_category.CHANGE_POSITION, req, noteId); await sql.addAudit(audit_category.CHANGE_POSITION, req, noteId);
@@ -74,10 +84,11 @@ router.put('/:noteId/moveAfter/:afterNoteId', async (req, res, next) => {
}); });
router.put('/:noteId/expanded/:expanded', async (req, res, next) => { router.put('/:noteId/expanded/:expanded', async (req, res, next) => {
let noteId = req.params.noteId; const noteId = req.params.noteId;
let expanded = req.params.expanded; const expanded = req.params.expanded;
const now = utils.nowTimestamp();
await sql.execute("update notes_tree set is_expanded = ? where note_id = ?", [expanded, noteId]); await sql.execute("update notes_tree set is_expanded = ?, date_modified = ? where note_id = ?", [expanded, now, noteId]);
// no audit here, not really important // no audit here, not really important

2
services/migration.js
View File

@@ -2,7 +2,7 @@ const backup = require('./backup');
const sql = require('./sql'); const sql = require('./sql');
const fs = require('fs-extra'); const fs = require('fs-extra');
const APP_DB_VERSION = 3; const APP_DB_VERSION = 4;
const MIGRATIONS_DIR = "./migrations"; const MIGRATIONS_DIR = "./migrations";
async function migrate() { async function migrate() {