diff --git a/src/controllers/users.js b/src/controllers/users.js index 6a3e02b252..5c669d6e6d 100644 --- a/src/controllers/users.js +++ b/src/controllers/users.js @@ -34,14 +34,12 @@ usersController.getOnlineUsers = function(req, res, next) { }); } - var anonymousUserCount = websockets.getOnlineAnonCount(); - var userData = { + 'route_users:online': true, search_display: 'hidden', loadmore_display: results.count > 50 ? 'block' : 'hide', users: results.users, - anonymousUserCount: anonymousUserCount, - show_anon: anonymousUserCount ? '' : 'hide' + anonymousUserCount: websockets.getOnlineAnonCount() }; res.render('users', userData); @@ -70,10 +68,9 @@ usersController.getUsers = function(set, count, req, res, next) { search_display: 'hidden', loadmore_display: data.count > count ? 'block' : 'hide', users: data.users, - show_anon: 'hide', pagination: pagination.create(1, pageCount) }; - + userData['route_' + set] = true; res.render('users', userData); }); }; @@ -109,8 +106,7 @@ usersController.getUsersForSearch = function(req, res, next) { var userData = { search_display: 'block', loadmore_display: 'hidden', - users: data.users, - show_anon: 'hide' + users: data.users }; res.render('users', userData); diff --git a/src/user.js b/src/user.js index 86e0d904be..7ae0d17be4 100644 --- a/src/user.js +++ b/src/user.js @@ -9,7 +9,8 @@ var async = require('async'), meta = require('./meta'), topics = require('./topics'), groups = require('./groups'), - Password = require('./password'); + Password = require('./password'), + utils = require('../public/src/utils'); (function(User) { @@ -240,7 +241,7 @@ var async = require('async'), }; 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) { if (err) { return callback(err); @@ -268,6 +269,7 @@ var async = require('async'), return; } user.status = User.getStatus(user.status, results.isOnline[index]); + user.joindateISO = utils.toISOString(user.joindate); user.administrator = results.isAdmin[index]; user.banned = parseInt(user.banned, 10) === 1; user['email:confirmed'] = parseInt(user['email:confirmed'], 10) === 1;