summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2018-06-02 15:34:49 +0200
committerJules Laplace <julescarbon@gmail.com>2018-06-02 15:34:49 +0200
commit5bad6e548d592c601c6b4092c144ac51baa73354 (patch)
treecf80558659af6b82fafbc4139ae30c4f1df4830f /app
parent64b39c3bcb2c8628de2126f3b8c4db5f83dd1436 (diff)
taskactions
Diffstat (limited to 'app')
-rw-r--r--app/client/system/system.component.js2
-rw-r--r--app/server/site.js1
2 files changed, 2 insertions, 1 deletions
diff --git a/app/client/system/system.component.js b/app/client/system/system.component.js
index a4bba81..a4be0c9 100644
--- a/app/client/system/system.component.js
+++ b/app/client/system/system.component.js
@@ -149,7 +149,7 @@ const mapStateToProps = state => ({
const mapDispatchToProps = (dispatch, ownProps) => ({
actions: {
system: bindActionCreators(systemActions, dispatch),
- task: bindActionCreators(taskActions, dispatch),
+ queue: bindActionCreators(queueActions, dispatch),
live: bindActionCreators(liveActions, dispatch),
},
})
diff --git a/app/server/site.js b/app/server/site.js
index ff905af..fc84d9b 100644
--- a/app/server/site.js
+++ b/app/server/site.js
@@ -56,6 +56,7 @@ app.post('/folder/:id/upload/',
name: filename.replace(/-/g,'_').replace(/\s/g,'_').replace(/_+/g,'_'),
url,
size: file.size,
+ datatype: file.mime.split('/'),
activity: req.body.activity || 'url',
module: req.body.module,
epoch: 0,