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

moved filter:user,get to central function

Browse Source
This commit is contained in:
barisusakli
2015-01-27 17:37:21 -05:00
parent c06132e779
commit ab69477b24
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/controllers/users.js
View File

@@ -44,9 +44,7 @@ usersController.getOnlineUsers = function(req, res, next) {
show_anon: anonymousUserCount ? '' : 'hide'
};
plugins.fireHook('filter:userlist.get', {data: userData, uid: uid}, function(err, userData) {
res.render('users', userData.data);
});
res.render('users', userData);
});
};
@@ -76,9 +74,7 @@ usersController.getUsers = function(set, count, req, res, next) {
show_anon: 'hide'
};
plugins.fireHook('filter:userlist.get', {data: userData, uid: uid}, function(err, userData) {
res.render('users', userData.data);
});
res.render('users', userData);
});
};
@@ -118,9 +114,7 @@ usersController.getUsersForSearch = function(req, res, next) {
show_anon: 'hide'
};
plugins.fireHook('filter:userlist.get', {data: userData, uid: uid}, function(err, userData) {
res.render('users', userData.data);
});
res.render('users', userData);
});
};

8
src/user.js
View File

@@ -249,8 +249,12 @@ var async = require('async'),
user.banned = parseInt(user.banned, 10) === 1;
user['email:confirmed'] = parseInt(user['email:confirmed'], 10) === 1;
});
callback(null, results.userData);
plugins.fireHook('filter:userlist.get', {users: results.userData}, function(err, data) {
if (err) {
return callback(err);
}
callback(null, data.users);
});
});
});
};