Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 19:15:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

return err form updateProfile

Browse Source
This commit is contained in:
Baris Usakli
2013-09-11 13:53:42 -04:00
parent be51025048
commit 251587cb86
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/forum/accountedit.js
View File

@@ -107,7 +107,7 @@ $(document).ready(function() {
signature:$('#inputSignature').val() signature:$('#inputSignature').val()
}; };
socket.emit('api:user.updateProfile', userData, function(data) { socket.emit('api:user.updateProfile', userData, function(err, data) {
if(data.success) { if(data.success) {
app.alertSuccess('Your profile has been updated successfully!'); app.alertSuccess('Your profile has been updated successfully!');
if(data.picture) { if(data.picture) {

18
src/user.js
View File

@@ -224,29 +224,27 @@ var utils = require('./../public/src/utils.js'),
async.series([isSignatureValid, isEmailAvailable], function(err, results) { async.series([isSignatureValid, isEmailAvailable], function(err, results) {
if(err) { if(err) {
console.log(err); callback(err, returnData);
callback(returnData);
} else { } else {
async.each(fields, updateField, function(err) { async.each(fields, updateField, function(err) {
if(err) { if(err) {
console.log(err); callback(err, returnData);
callback(returnData);
} else { } else {
returnData.success = true; returnData.success = true;
callback(returnData); callback(null, returnData);
} }
}); });
} }
}); });
function updateField(field, callback) { function updateField(field, next) {
if(data[field] !== undefined) { if(data[field] !== undefined) {
if(field === 'email') { if(field === 'email') {
var gravatarpicture = User.createGravatarURLFromEmail(data[field]); var gravatarpicture = User.createGravatarURLFromEmail(data[field]);
User.setUserField(uid, 'gravatarpicture', gravatarpicture); User.setUserField(uid, 'gravatarpicture', gravatarpicture);
User.getUserFields(uid, ['email', 'picture', 'uploadedpicture'], function(err, userData) { User.getUserFields(uid, ['email', 'picture', 'uploadedpicture'], function(err, userData) {
if(err) if(err)
return callback(err); return next(err);
RDB.del('email:' + userData['email'] + ':uid'); RDB.del('email:' + userData['email'] + ':uid');
RDB.set('email:' + data['email'] + ':uid', uid); RDB.set('email:' + data['email'] + ':uid', uid);
@@ -256,7 +254,7 @@ var utils = require('./../public/src/utils.js'),
User.setUserField(uid, 'picture', gravatarpicture); User.setUserField(uid, 'picture', gravatarpicture);
} }
returnData.gravatarpicture = gravatarpicture; returnData.gravatarpicture = gravatarpicture;
callback(null); next(null);
}); });
return; return;
} else if(field === 'signature') { } else if(field === 'signature') {
@@ -265,9 +263,9 @@ var utils = require('./../public/src/utils.js'),
User.setUserField(uid, field, data[field]); User.setUserField(uid, field, data[field]);
callback(null); next(null);
} else { } else {
callback(null); next(null);
} }
} }
} }