diff options
| author | Jules Laplace <julescarbon@gmail.com> | 2018-06-26 16:41:38 +0200 |
|---|---|---|
| committer | Jules Laplace <julescarbon@gmail.com> | 2018-06-26 16:41:38 +0200 |
| commit | fd1b25982b53083a17c8131bb734ecbfbdcb61e3 (patch) | |
| tree | 4d0ed1a673b8f9eae8ff41d067a7a02ef7c2c6d7 /app/server | |
| parent | 5a2aa1c87c341549aa43750db350bd41940491a7 (diff) | |
msg
Diffstat (limited to 'app/server')
| -rw-r--r-- | app/server/bridge.js | 2 | ||||
| -rw-r--r-- | app/server/site.js | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/server/bridge.js b/app/server/bridge.js index 09e83b0..1a744a3 100644 --- a/app/server/bridge.js +++ b/app/server/bridge.js @@ -63,7 +63,7 @@ function bind_relay(socket) { db.models.file.update(data.task.opt.file_id, { dataset: data.task.dataset, }).then(file => { - client.emit('api_res', { type: 'update', datatype: 'file', data: file }) + client.emit('api_res', { type: 'update', datatype: 'file', data: JSON.stringify(file) }) }).catch(err => { console.error('error setting the dataset', err) }) diff --git a/app/server/site.js b/app/server/site.js index a7ad501..99f1e63 100644 --- a/app/server/site.js +++ b/app/server/site.js @@ -72,10 +72,11 @@ app.post('/api/folder/:id/upload/', api_files.create(data).then( (db_file) => { console.log(db_file) // console.log(req.body) - if (req.body.should_relay === "true" || req.body.generated === "true") { // if this came from an automated command... + // if this came from an automated command... + if (req.body.should_relay === "true" || req.body.generated === "true") { console.log('relaying...') const client = require('./bridge').client - client.emit('api_res', { type: 'create', datatype: 'file', data: db_file }) + client.emit('api_res', { type: 'create', datatype: 'file', data: JSON.stringify(db_file) }) } resolve(db_file) }).catch( (err) => { |