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

added route to /users

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2015-04-01 15:22:56 -04:00
parent 232d1aae31
commit 5641e54192
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/controllers/users.js
View File

@@ -34,14 +34,12 @@ usersController.getOnlineUsers = function(req, res, next) {
}); });
} }
var anonymousUserCount = websockets.getOnlineAnonCount();
var userData = { var userData = {
'route_users:online': true,
search_display: 'hidden', search_display: 'hidden',
loadmore_display: results.count > 50 ? 'block' : 'hide', loadmore_display: results.count > 50 ? 'block' : 'hide',
users: results.users, users: results.users,
anonymousUserCount: anonymousUserCount, anonymousUserCount: websockets.getOnlineAnonCount()
show_anon: anonymousUserCount ? '' : 'hide'
}; };
res.render('users', userData); res.render('users', userData);
@@ -70,10 +68,9 @@ usersController.getUsers = function(set, count, req, res, next) {
search_display: 'hidden', search_display: 'hidden',
loadmore_display: data.count > count ? 'block' : 'hide', loadmore_display: data.count > count ? 'block' : 'hide',
users: data.users, users: data.users,
show_anon: 'hide',
pagination: pagination.create(1, pageCount) pagination: pagination.create(1, pageCount)
}; };
userData['route_' + set] = true;
res.render('users', userData); res.render('users', userData);
}); });
}; };
@@ -109,8 +106,7 @@ usersController.getUsersForSearch = function(req, res, next) {
var userData = { var userData = {
search_display: 'block', search_display: 'block',
loadmore_display: 'hidden', loadmore_display: 'hidden',
users: data.users, users: data.users
show_anon: 'hide'
}; };
res.render('users', userData); res.render('users', userData);

6
src/user.js
View File

@@ -9,7 +9,8 @@ var async = require('async'),
meta = require('./meta'), meta = require('./meta'),
topics = require('./topics'), topics = require('./topics'),
groups = require('./groups'), groups = require('./groups'),
Password = require('./password'); Password = require('./password'),
utils = require('../public/src/utils');
(function(User) { (function(User) {
@@ -240,7 +241,7 @@ var async = require('async'),
}; };
User.getUsers = function(uids, uid, callback) { User.getUsers = function(uids, uid, callback) {
var fields = ['uid', 'username', 'userslug', 'picture', 'status', 'banned', 'postcount', 'reputation', 'email:confirmed']; var fields = ['uid', 'username', 'userslug', 'picture', 'status', 'banned', 'joindate', 'postcount', 'reputation', 'email:confirmed'];
plugins.fireHook('filter:users.addFields', {fields: fields}, function(err, data) { plugins.fireHook('filter:users.addFields', {fields: fields}, function(err, data) {
if (err) { if (err) {
return callback(err); return callback(err);
@@ -268,6 +269,7 @@ var async = require('async'),
return; return;
} }
user.status = User.getStatus(user.status, results.isOnline[index]); user.status = User.getStatus(user.status, results.isOnline[index]);
user.joindateISO = utils.toISOString(user.joindate);
user.administrator = results.isAdmin[index]; user.administrator = results.isAdmin[index];
user.banned = parseInt(user.banned, 10) === 1; user.banned = parseInt(user.banned, 10) === 1;
user['email:confirmed'] = parseInt(user['email:confirmed'], 10) === 1; user['email:confirmed'] = parseInt(user['email:confirmed'], 10) === 1;