From 4a0717d5f8aa0ff3378ff589b106cd35c0586367 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 29 Sep 2014 19:31:25 -0400
Subject: outline walls on builder

---
 server/lib/api/projects.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'server/lib')

diff --git a/server/lib/api/projects.js b/server/lib/api/projects.js
index da41b48..61a6e10 100644
--- a/server/lib/api/projects.js
+++ b/server/lib/api/projects.js
@@ -21,10 +21,10 @@ var projects = {
 			}
 			else {
 				var name = util.sanitize(req.params.slug)
-				if (name == "new") {
-					name = ""
-				}
-				res.json({ _id: "new", name: name, isNew: true })
+        Project.count({}, function(err, count){
+          name = "Project #" + (count || 0)
+          res.json({ _id: "new", name: name, isNew: true })
+        })
 			}
 		})
 	},
-- 
cgit v1.2.3-70-g09d2


From e4fe87c0a5c3e441b533cdb4e0e85b683e244d3b Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Tue, 30 Sep 2014 02:42:42 -0400
Subject: untitled room

---
 public/assets/javascripts/ui/editor/EditorSettings.js | 2 +-
 server/lib/middleware.js                              | 2 +-
 views/staff/_projects.ejs                             | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'server/lib')

diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index 92eff2b..8a88f7a 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -53,7 +53,7 @@ var EditorSettings = FormView.extend({
     }
 
 		if (data.isNew) {
-		  this.$name.val( "Room " + moment().format("DD/MM/YYYY ha") )
+		  this.$name.val( "Untitled Room" )
 		}
 		else {
 			this.thumbnailIsStale()
diff --git a/server/lib/middleware.js b/server/lib/middleware.js
index b3c9bec..0bf16ce 100644
--- a/server/lib/middleware.js
+++ b/server/lib/middleware.js
@@ -59,7 +59,7 @@ var middleware = {
 				}
 				next()
 			})
-		}
+		}	
 		else {
 			req.project = null
 			next()
diff --git a/views/staff/_projects.ejs b/views/staff/_projects.ejs
index 9e37a6c..0fdfcf5 100644
--- a/views/staff/_projects.ejs
+++ b/views/staff/_projects.ejs
@@ -8,11 +8,11 @@
       <a href="/project/[[- project.slug ]]">[view]</a>
       <a href="/project/[[- project.slug ]]/edit">[edit]</a>
     </td>
-    [[ if (project.user) { ]]
     <td>
+    [[ if (project.user) { ]]
       <a href="/staff/users/[[- project.user.username ]]">[[- project.user.username ]]</a>
-    </td>
     [[ } ]]
+    </td>
     <td>
       [[- project.date ]]
     </td>
-- 
cgit v1.2.3-70-g09d2


From 746dc328ab759d95935177834525b4a1dfccffff Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 30 Sep 2014 02:53:34 -0400
Subject: forgot $in

---
 server/lib/views/staff.js | 6 +++---
 views/staff/_projects.ejs | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'server/lib')

diff --git a/server/lib/views/staff.js b/server/lib/views/staff.js
index ffacee2..41877c8 100644
--- a/server/lib/views/staff.js
+++ b/server/lib/views/staff.js
@@ -143,14 +143,14 @@ var staff = module.exports = {
     },
     
     ensureObjectsUsers: function(objects, next){
-			if (! objects) { return next () }
+      if (! objects) { return next () }
       var dedupe = {}, user_ids
       objects.forEach(function(obj){
         dedupe[ obj.user_id ] = dedupe[ obj.user_id ] || []
         dedupe[ obj.user_id ].push(obj)
       })
       user_ids = _.keys(dedupe)
-      User.find({ _id: user_ids })
+      User.find({ _id: { $in: user_ids } })
           .select(staff.fields.user)
           .exec(function (err, users) {
         if (! users) { return next () }
@@ -527,4 +527,4 @@ var staff = module.exports = {
     },
   }
 
-}
\ No newline at end of file
+}
diff --git a/views/staff/_projects.ejs b/views/staff/_projects.ejs
index 0fdfcf5..2c3eb9f 100644
--- a/views/staff/_projects.ejs
+++ b/views/staff/_projects.ejs
@@ -7,11 +7,10 @@
     <td class="editLinks">
       <a href="/project/[[- project.slug ]]">[view]</a>
       <a href="/project/[[- project.slug ]]/edit">[edit]</a>
+      <a href="/api/rooms/[[- project.slug ]]">[api]</a>
     </td>
     <td>
-    [[ if (project.user) { ]]
       <a href="/staff/users/[[- project.user.username ]]">[[- project.user.username ]]</a>
-    [[ } ]]
     </td>
     <td>
       [[- project.date ]]
-- 
cgit v1.2.3-70-g09d2