From 869bccea18e88e3b6b8a7f4800eaf01ab3b52204 Mon Sep 17 00:00:00 2001 From: azivner Date: Sat, 4 Nov 2017 11:44:42 -0400 Subject: [PATCH] event log now shows full path of notes and works with encryption --- public/javascripts/event_log.js | 3 +-- routes/api/event_log.js | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/public/javascripts/event_log.js b/public/javascripts/event_log.js index e3ece7a4a..8e8882114 100644 --- a/public/javascripts/event_log.js +++ b/public/javascripts/event_log.js @@ -20,7 +20,7 @@ async function showEventLog() { if (event.note_id) { const noteLink = $("", { href: 'app#' + event.note_id, - text: event.note_title + text: getFullName(event.note_id) }).prop('outerHTML'); console.log(noteLink); @@ -30,7 +30,6 @@ async function showEventLog() { const eventEl = $('
  • ').html(dateTime + " - " + event.comment); - eventLogList.append(eventEl); } } diff --git a/routes/api/event_log.js b/routes/api/event_log.js index d75ba4f75..0f8afbe58 100644 --- a/routes/api/event_log.js +++ b/routes/api/event_log.js @@ -7,8 +7,7 @@ const sql = require('../../services/sql'); router.get('', async (req, res, next) => { await deleteOld(); - const result = await sql.getResults("SELECT e.id, e.note_id, e.comment, e.date_added, n.note_title " + - "FROM event_log e LEFT JOIN notes n ON e.note_id = n.note_id ORDER BY date_added DESC"); + const result = await sql.getResults("SELECT * FROM event_log ORDER BY date_added DESC"); res.send(result); });