merge

2 files changed, 11 insertions, 3 deletions

diff --git a/server/lib/api/media.js b/server/lib/api/media.js
index 1eb08c1..4e2fad5 100644
--- a/server/lib/api/media.js
+++ b/server/lib/api/media.js
@@ -10,13 +10,19 @@ var _ = require('lodash'),
 var media = {
 
 	user: function(req, res){
+	  var offset = Number(req.query.offset) || 0
+	  var limit = Math.min( Number(req.query.limit), 50 ) || 20
 	  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 || [])
-		})
+		Media.find(query)
+			.sort({'created_at': -1})
+			.skip(offset)
+			.limit(limit)
+		  .exec(function(err, media){
+				res.json(media || [])
+			})
 	},
 	
 	create: function(req, res){
diff --git a/server/lib/api/projects.js b/server/lib/api/projects.js
index f699622..1bf046f 100644
--- a/server/lib/api/projects.js
+++ b/server/lib/api/projects.js
@@ -36,6 +36,7 @@ var projects = {
 		data.name = util.sanitize(data.name)
 		data.slug = util.slugify(data.name) + "-" + (+new Date)
 		data.description = util.sanitize(data.description)
+		data.viewHeight = Number(data.viewHeight || 0)
 		data.rooms = JSON.parse(data.rooms)
 		data.walls = JSON.parse(data.walls)
 		data.media = JSON.parse(data.media)
@@ -95,6 +96,7 @@ var projects = {
           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)