merge

1 files changed, 31 insertions, 12 deletions

diff --git a/server/lib/api/projects.js b/server/lib/api/projects.js
index 61a6e10..50d3b49 100644
--- a/server/lib/api/projects.js
+++ b/server/lib/api/projects.js
@@ -34,13 +34,21 @@ var projects = {
 
 		data.user_id = req.user._id
 		data.name = util.sanitize(data.name)
-		data.slug = util.slugify(data.name)
+		data.slug = util.slugify(data.name) + "-" + (+new Date)
 		data.description = util.sanitize(data.description)
-		data.rooms = JSON.parse(data.rooms)
+		data.viewHeight = Number(data.viewHeight || 0)
+		if (data.shapes) {
+      data.shapes = JSON.parse(data.shapes)
+		}
+		else {
+      data.rooms = JSON.parse(data.rooms)
+		}
 		data.walls = JSON.parse(data.walls)
 		data.media = JSON.parse(data.media)
+		data.sculpture = JSON.parse(data.sculpture)
 		data.colors = JSON.parse(data.colors)
 		data.startPosition = JSON.parse(data.startPosition)
+		data.lastPosition = JSON.parse(data.lastPosition)
 		data.created_at = new Date ()
 
 		upload.put("projects", req.files.thumbnail, {
@@ -67,13 +75,7 @@ var projects = {
 			return docs.create(req, res)
 		}
 
-		var data = util.cleanQuery(req.body)
-
-		// data.user_id = req.user._id
-		data.name = util.sanitize(data.name)
-		data.slug = util.slugify(data.name)
-		data.description = util.sanitize(data.description)
-		data.updated_at = new Date ()
+    var data = util.cleanQuery(req.body)
 
     if (req.files.thumbnail) {
       upload.put("projects", req.files.thumbnail, {
@@ -93,13 +95,30 @@ var projects = {
 		function done() {
 			Project.findOne({ _id: _id }, function(err, doc){
 				if (err || ! doc) { return res.json({ error: err }) }
+
+        // data.user_id = req.user._id
+        data.name = util.sanitize(data.name)
+        if (data.name != doc.name) {
+          data.slug = util.slugify(data.name) + "-" + (+new Date)
+        }
+        data.description = util.sanitize(data.description)
+        data.viewHeight = Number(data.viewHeight || 0)
+        data.updated_at = new Date ()
+
 				_.extend(doc, data)
-				
-				doc.rooms = JSON.parse(data.rooms)
+
+        if (data.shapes) {
+          doc.shapes = JSON.parse(data.shapes)
+        }
+        else {
+          doc.rooms = JSON.parse(data.rooms)
+        }
 				doc.walls = JSON.parse(data.walls)
 				doc.colors = JSON.parse(data.colors)
 				doc.media = JSON.parse(data.media)
-				doc.startPosition = JSON.parse(data.startPosition)
+				doc.sculpture = JSON.parse(data.sculpture)
+        doc.startPosition = JSON.parse(data.startPosition)
+        doc.lastPosition = JSON.parse(data.lastPosition)
 
 				doc.save(function(err, doc){
 					if (err || ! doc) { return res.json({ error: err }) }