diff --git a/controllers/user.js b/controllers/user.js index 2d5be0f1df0..eee78e5e025 100644 --- a/controllers/user.js +++ b/controllers/user.js @@ -1,7 +1,9 @@ var mongoose = require('mongoose'), - passport = require('passport'); + passport = require('passport'), + _ = require('underscore'); // Import models +var User = require('../models/User'); exports.account = function(req, res) { res.render('account', { user: req.user }); @@ -45,7 +47,7 @@ exports.getSignup = function(req, res) { res.render('signup', { title: 'Create Account', user: req.user, - message: req.session.messages + messages: req.flash('messages') }); }; @@ -63,9 +65,13 @@ exports.postSignup = function(req, res) { user.save(function(err) { if (err) { if (err.code === 11000) { - return res.send('Duplicate user detected'); + req.flash('messages', 'Duplicate user detected'); + return res.redirect('/signup'); } else if (err.name === 'ValidationError') { - return res.send(err.errors); + console.log(); + req.flash('messages', _.toArray(err.errors)); + //console.log(err); + return res.redirect('/signup'); } } req.logIn(user, function(err) { diff --git a/views/signup.jade b/views/signup.jade index 554b33baf06..7d047288fe8 100644 --- a/views/signup.jade +++ b/views/signup.jade @@ -24,4 +24,10 @@ block content .form-group label(for='confirmPassword') Confirm Password input.form-control(type='password', id='confirmPassword', placeholder='Confirm Password') - button.btn.btn.btn-primary(type='submit') Signup \ No newline at end of file + button.btn.btn.btn-primary(type='submit') Signup + + if messages.length + for msg in messages + p.alert.alert-danger + strong #{msg.name}: + | #{msg.message}