Skip to content

Commit

Permalink
Fix flow for editing gravatar after registration.
Browse files Browse the repository at this point in the history
  • Loading branch information
martindale committed May 4, 2015
1 parent 1ca84eb commit db9c29a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion lang/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions soundtrack.js
Original file line number Diff line number Diff line change
Expand Up @@ -755,7 +755,7 @@ app.post('/:usernameSlug/sets', requireLogin, playlists.create );
app.post('/:usernameSlug/sets/:playlistID', requireLogin, playlists.addTrack );
app.post('/:usernameSlug/sets/:playlistID/edit', requireLogin, playlists.edit ); // TODO: fix URL

app.get('/register', redirectToMainSite , function(req, res) {
app.get('/register', function(req, res) {
res.render('register');
});

Expand All @@ -782,12 +782,11 @@ app.post('/register', function(req, res) {

Person.register(new Person({ username : req.body.username }), req.body.password, function(err, user) {
if (err) {
console.log(err);
req.flash('error', 'Something went wrong: ' + err);
return res.render('register', { user : user });
} else {
req.logIn(user, function(err) {
req.flash('info', lang.en.intro );
req.flash('info', lang.en.intro.replace('{{username}}', user.slug ) );
res.redirect('/');
});
}
Expand Down

0 comments on commit db9c29a

Please sign in to comment.