Quellcode durchsuchen

Merge branch 'master' of github.com:tracim/tracim_front

AlexiCauvin vor 8 Jahren
Ursprung
Commit
4f3a5bd691
1 geänderte Dateien mit 8 neuen und 2 gelöschten Zeilen
  1. 8 2
      jsonserver/server.js

+ 8 - 2
jsonserver/server.js Datei anzeigen

55
 server.get('/user/:id/workspace', (req, res) => res.jsonp(jsonDb.workspace_list))
55
 server.get('/user/:id/workspace', (req, res) => res.jsonp(jsonDb.workspace_list))
56
 
56
 
57
 server.get('/workspace/:id', (req, res) => res.jsonp(
57
 server.get('/workspace/:id', (req, res) => res.jsonp(
58
-  // {...jsonDb.workspace_detail, content: shuffle(jsonDb.workspace_detail.content)})
59
-  Object.assign({}, jsonDb.workspace_detail, {content: shuffle(jsonDb.workspace_detail.content)}, {id: req.params.id})
58
+  Object.assign(
59
+    {},
60
+    jsonDb.workspace_detail,
61
+    {content: shuffle(jsonDb.workspace_detail.content.map(
62
+      c => Object.assign({}, c, {workspace_id: req.params.id})
63
+    ))},
64
+    {id: req.params.id}
65
+  )
60
 ))
66
 ))
61
 
67
 
62
 server.get('/workspace/:idws/folder/:idf', (req, res) => {
68
 server.get('/workspace/:idws/folder/:idf', (req, res) => {