summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-08-05 18:33:24 -0400
committerJules Laplace <jules@okfoc.us>2014-08-05 18:33:24 -0400
commit1d2c2624c6e84c0f5ea7f7f7fc8e638a6ea5bcdd (patch)
tree0e54d0caf47eeb1448aaf0cdb1c70439d1a065b3 /server
parent8cf6d964f91354f85a2b831e2b6e313b04a72173 (diff)
parentbac4d6a8c8566814e851452bedf5fa7ce596d54d (diff)
Merge branch 'mobile'
Diffstat (limited to 'server')
-rw-r--r--server/index.js3
-rw-r--r--server/lib/views.js2
2 files changed, 3 insertions, 2 deletions
diff --git a/server/index.js b/server/index.js
index 71cd862..32dc709 100644
--- a/server/index.js
+++ b/server/index.js
@@ -120,8 +120,9 @@ site.route = function () {
app.get('/project', middleware.ensureAuthenticated, views.modal)
app.get('/project/new', middleware.ensureAuthenticated, views.modal)
app.get('/project/new/:layout', middleware.ensureAuthenticated, views.editor)
- app.get('/project/:slug', middleware.ensureProject, views.editor)
+ app.get('/project/:slug', middleware.ensureProject, views.reader)
app.get('/project/:slug/view', middleware.ensureProject, views.reader)
+ app.get('/project/:slug/edit', middleware.ensureProject, views.editor)
app.get('/api/layout', middleware.ensureAuthenticated, api.layouts.index)
app.get('/api/layout/:slug', middleware.ensureAuthenticated, api.layouts.show)
diff --git a/server/lib/views.js b/server/lib/views.js
index 81e2ced..27b7446 100644
--- a/server/lib/views.js
+++ b/server/lib/views.js
@@ -45,7 +45,7 @@ views.editor = function (req, res) {
}
views.reader = function (req, res) {
- if (! req.user && ! req.project) {
+ if (! req.project) {
res.redirect('/')
}
User.findOne({ _id: req.project.user_id }, function(err, user) {