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

change getUserData to return err

Browse Source
This commit is contained in:
Baris Usakli
2013-09-11 13:02:55 -04:00
parent efa8717fc5
commit bb14881b63
4 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/templates/accountedit.tpl
View File

@@ -79,7 +79,7 @@
</div> </div>
</div> </div>
<div class="col-md-10"> <div class="col-md-5">
<div> <div>
<form class='form-horizontal'> <form class='form-horizontal'>
<div class="control-group"> <div class="control-group">
@@ -132,7 +132,11 @@
</form> </form>
</div> </div>
<hr />
<hr/>
</div>
<div class="col-md-5">
<div style="vertical-align:top;"> <div style="vertical-align:top;">
<form class='form-horizontal'> <form class='form-horizontal'>
<div class="control-group"> <div class="control-group">

4
src/groups.js
View File

@@ -29,9 +29,7 @@ var async = require('async'),
if (err) return next(err); if (err) return next(err);
async.map(uids, function(uid, next) { async.map(uids, function(uid, next) {
User.getUserData(uid, function(data) { User.getUserData(uid, next);
next(null, data);
});
}, function(err, users) { }, function(err, users) {
next(err, users); next(err, users);
}); });

4
src/routes/user.js
View File

@@ -14,7 +14,7 @@ var user = require('./../user.js'),
if(!req.params.uid) if(!req.params.uid)
return res.redirect('/404'); return res.redirect('/404');
user.getUserData(req.params.uid, function(data) { user.getUserData(req.params.uid, function(err, data) {
if(data) { if(data) {
res.send(data); res.send(data);
} else { } else {
@@ -406,7 +406,7 @@ var user = require('./../user.js'),
return; return;
} }
user.getUserData(uid, function(data) { user.getUserData(uid, function(err, data) {
if(data) { if(data) {
data.joindate = utils.relativeTime(data.joindate); data.joindate = utils.relativeTime(data.joindate);

16
src/user.js
View File

@@ -111,7 +111,7 @@ var utils = require('./../public/src/utils.js'),
if(exists === 1) { if(exists === 1) {
console.log('deleting uid ' + uid); console.log('deleting uid ' + uid);
User.getUserData(uid, function(data) { User.getUserData(uid, function(err, data) {
RDB.del('username:' + data['username'] + ':uid'); RDB.del('username:' + data['username'] + ':uid');
RDB.del('email:' + data['email'] +':uid'); RDB.del('email:' + data['email'] +':uid');
RDB.del('userslug:'+ data['userslug'] +':uid'); RDB.del('userslug:'+ data['userslug'] +':uid');
@@ -175,15 +175,11 @@ var utils = require('./../public/src/utils.js'),
User.getUserData = function(uid, callback) { User.getUserData = function(uid, callback) {
RDB.hgetall('user:' + uid, function(err, data) { RDB.hgetall('user:' + uid, function(err, data) {
if(err === null) {
if(data) { if(data && data['password']) {
if(data['password'])
delete data['password']; delete data['password'];
} }
callback(data); callback(err, data);
} else {
console.log(err);
}
}); });
} }
@@ -340,7 +336,7 @@ var utils = require('./../public/src/utils.js'),
} }
function iterator(uid, callback) { function iterator(uid, callback) {
User.getUserData(uid, function(userData) { User.getUserData(uid, function(err, userData) {
if(userData) { if(userData) {
data.push(userData); data.push(userData);
} }
@@ -576,7 +572,7 @@ var utils = require('./../public/src/utils.js'),
} }
function iterator(uid, callback) { function iterator(uid, callback) {
User.getUserData(uid, function(userData) { User.getUserData(uid, function(err, userData) {
returnData.push(userData); returnData.push(userData);
callback(null); callback(null);