Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-10 16:05:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

property fixed #2087

Browse Source
This commit is contained in:
Julian Lam
2014-10-14 11:48:16 -04:00
parent 08d4d6b5bf
commit b5481ceed2
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public/src/client/login.js
View File

@@ -33,6 +33,16 @@ define('forum/login', function() {
}); });
$('#content #username').focus(); $('#content #username').focus();
// Add "returnTo" data if present
if (app.previousUrl) {
var returnToEl = document.createElement('input');
returnToEl.type = 'hidden';
returnToEl.name = 'returnTo';
returnToEl.value = app.previousUrl.replace(window.location.origin + RELATIVE_PATH, '');
$(returnToEl).appendTo(formEl);
console.log('appended');
}
}; };
return Login; return Login;

5
src/routes/authentication.js
View File

@@ -83,6 +83,11 @@
return res.status(404).send(''); return res.status(404).send('');
} }
// Handle returnTo data
if (req.body.hasOwnProperty('returnTo') && !req.session.returnTo) {
req.session.returnTo = req.body.returnTo;
}
if (req.body.username && utils.isEmailValid(req.body.username)) { if (req.body.username && utils.isEmailValid(req.body.username)) {
user.getUsernameByEmail(req.body.username, function(err, username) { user.getUsernameByEmail(req.body.username, function(err, username) {
if (err) { if (err) {