diff options
Diffstat (limited to 'routes')
| -rw-r--r-- | routes/sessions.coffee | 12 | ||||
| -rw-r--r-- | routes/users.coffee | 15 |
2 files changed, 9 insertions, 18 deletions
diff --git a/routes/sessions.coffee b/routes/sessions.coffee index 9b4c4126..3e8f5cf0 100644 --- a/routes/sessions.coffee +++ b/routes/sessions.coffee @@ -10,7 +10,11 @@ module.exports = (passport) -> if (err) return next(err) if (!user) - return res.redirect('/login') + return res.render('sessions/new', + js: (-> global.js), + css: (-> global.css), + badpw: true + ) req.login(user, (err) -> if (err) return next(err) @@ -21,8 +25,4 @@ module.exports = (passport) -> destroy: (req, res) -> req.logout() - res.render('sessions/new', - js: (-> global.js), - css: (-> global.css), - badpw: true - ) + res.redirect('/login') diff --git a/routes/users.coffee b/routes/users.coffee index 86132591..04284d5a 100644 --- a/routes/users.coffee +++ b/routes/users.coffee @@ -47,18 +47,9 @@ module.exports = (sessions) -> ) new: (req, res) -> - db.smembers('mts', (err, keys) -> - mts = [] - for mt in keys - db.hgetall(mt, (err, it) -> - mts.push(it) - if keys.length==mts.length - res.render('users/new', - js: (-> global.js), - css: (-> global.css), - mtypes: mts - ) - ) + res.render('users/new', + js: (-> global.js), + css: (-> global.css) ) create: (req, res) -> |