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

reset fix for t.js bug :rage3:

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2015-03-17 15:53:05 -04:00
parent e45e204ba5
commit 37fe438c63
3 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/src/client/reset.js
View File

@@ -24,6 +24,7 @@ define('forum/reset', function() {
successEl.addClass('hide').hide(); successEl.addClass('hide').hide();
errorEl.removeClass('hide').show(); errorEl.removeClass('hide').show();
} }
return false;
}); });
}; };

16
public/src/client/reset_code.js
View File

@@ -31,22 +31,8 @@ define('forum/reset_code', function() {
window.location.href = RELATIVE_PATH + '/login'; window.location.href = RELATIVE_PATH + '/login';
}); });
} }
return false;
}); });
// socket.emit('user.reset.valid', reset_code, function(err, valid) {
// if(err) {
// return app.alertError(err.message);
// }
// if (valid) {
// resetEl.prop('disabled', false);
// } else {
// var formEl = $('#reset-form');
// // Show error message
// $('#error').show();
// formEl.remove();
// }
// });
}; };
return ResetCode; return ResetCode;

7
src/controllers/index.js
View File

@@ -52,15 +52,18 @@ Controllers.home = function(req, res, next) {
Controllers.reset = function(req, res, next) { Controllers.reset = function(req, res, next) {
if (req.params.code) { if (req.params.code) {
user.reset.validate(req.params.code, function(err, valid) { user.reset.validate(req.params.code, function(err, valid) {
if (err) {
return next(err);
}
res.render('reset_code', { res.render('reset_code', {
valid: valid, valid: valid,
reset_code: req.params.code ? req.params.code : null, code: req.params.code ? req.params.code : null,
breadcrumbs: helpers.buildBreadcrumbs([{text: '[[reset_password:reset_password]]', url: '/reset'}, {text: '[[reset_password:update_password]]'}]) breadcrumbs: helpers.buildBreadcrumbs([{text: '[[reset_password:reset_password]]', url: '/reset'}, {text: '[[reset_password:update_password]]'}])
}); });
}); });
} else { } else {
res.render('reset', { res.render('reset', {
reset_code: req.params.code ? req.params.code : null, code: req.params.code ? req.params.code : null,
breadcrumbs: helpers.buildBreadcrumbs([{text: '[[reset_password:reset_password]]'}]) breadcrumbs: helpers.buildBreadcrumbs([{text: '[[reset_password:reset_password]]'}])
}); });
} }