merge

2 files changed, 14 insertions, 2 deletions

diff --git a/server/lib/api/media.js b/server/lib/api/media.js
index 16f9d41..1eb08c1 100644
--- a/server/lib/api/media.js
+++ b/server/lib/api/media.js
@@ -8,8 +8,13 @@ var _ = require('lodash'),
 	Media = require('../schemas/Media');
 
 var media = {
+
 	user: function(req, res){
-		Media.find({ user_id: req.user._id }, function(err, media){
+	  var query = { user_id: req.user._id }
+	  if (req.query.tag) {
+	    query.tag = req.query.tag
+	  }
+		Media.find(query, function(err, media){
 			res.json(media || [])
 		})
 	},
@@ -18,10 +23,14 @@ var media = {
 		var data = util.cleanQuery(req.body)
 		data.user_id = req.user._id
 		data.created_at = new Date ()
+		
+		if (data.tag) {
+		  data.tag = util.sanitize(data.tag)
+		}
 
 		new Media(data).save(function(err, rec){
 			if (err || ! rec) { return res.json({ error: err }) }
-			return res.json(rec) 
+			return res.json(rec)
 		})
 	},
 	
diff --git a/server/lib/api/projects.js b/server/lib/api/projects.js
index bd3cb81..2a5beff 100644
--- a/server/lib/api/projects.js
+++ b/server/lib/api/projects.js
@@ -39,6 +39,7 @@ var projects = {
 		data.rooms = JSON.parse(data.rooms)
 		data.walls = JSON.parse(data.walls)
 		data.media = JSON.parse(data.media)
+		data.colors = JSON.parse(data.colors)
 		data.startPosition = JSON.parse(data.startPosition)
 
 		upload.put("projects", req.files.thumbnail, {
@@ -91,8 +92,10 @@ var projects = {
 			Project.findOne({ _id: _id }, function(err, doc){
 				if (err || ! doc) { return res.json({ error: err }) }
 				_.extend(doc, data)
+				
 				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)