From e6c97c4913e5d24a908c65cc7592d9332df24057 Mon Sep 17 00:00:00 2001 From: Udo Walter Date: Fri, 22 Mar 2019 04:36:03 +0000 Subject: [webapp] add back to top button + log improvements --- server/api/log.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'server/api') diff --git a/server/api/log.js b/server/api/log.js index 05fe801..d3acb04 100644 --- a/server/api/log.js +++ b/server/api/log.js @@ -9,7 +9,12 @@ var router = decorateApp(express.Router()) // ########################### GET requests ################################# router.getAsync('', async (req, res) => { - const log = await db.log.findAll({ order: [['timestamp', 'DESC']] }) + const log = await db.log.findAll({ include: ['group', 'client', 'user'], order: [['timestamp', 'DESC']] }) + log.forEach(entry => { + if (entry.clientSnapshot) entry.clientSnapshot = JSON.parse(entry.clientSnapshot) + if (entry.groupSnapshot) entry.groupSnapshot = JSON.parse(entry.groupSnapshot) + if (entry.userSnapshot) entry.userSnapshot = JSON.parse(entry.userSnapshot) + }) res.send(log) }) -- cgit v1.2.3-55-g7522