summaryrefslogtreecommitdiffstats
path: root/server/api/log.js
diff options
context:
space:
mode:
authorUdo Walter2019-03-22 05:36:03 +0100
committerUdo Walter2019-03-22 05:36:03 +0100
commite6c97c4913e5d24a908c65cc7592d9332df24057 (patch)
tree80662936f9dcb8622a743726fac5fcfccd6bddd2 /server/api/log.js
parent[server/registration/backends] Rework addClient and updateClient to receive json (diff)
downloadbas-e6c97c4913e5d24a908c65cc7592d9332df24057.tar.gz
bas-e6c97c4913e5d24a908c65cc7592d9332df24057.tar.xz
bas-e6c97c4913e5d24a908c65cc7592d9332df24057.zip
[webapp] add back to top button + log improvements
Diffstat (limited to 'server/api/log.js')
-rw-r--r--server/api/log.js7
1 files changed, 6 insertions, 1 deletions
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)
})