mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-01 11:35:55 +01:00
closes #4930
This commit is contained in:
@@ -1,22 +1,30 @@
|
||||
'use strict';
|
||||
|
||||
var async = require('async'),
|
||||
_ = require('underscore'),
|
||||
var async = require('async');
|
||||
var _ = require('underscore');
|
||||
|
||||
user = require('../../user'),
|
||||
helpers = require('../helpers'),
|
||||
accountHelpers = require('./helpers');
|
||||
var user = require('../../user');
|
||||
var helpers = require('../helpers');
|
||||
var accountHelpers = require('./helpers');
|
||||
|
||||
var infoController = {};
|
||||
|
||||
infoController.get = function(req, res, next) {
|
||||
accountHelpers.getBaseUser(req.params.userslug, req.uid, function(err, userData) {
|
||||
if (err) {
|
||||
return next(err);
|
||||
}
|
||||
|
||||
async.parallel({
|
||||
ips: async.apply(user.getIPs, res.locals.uid, 4),
|
||||
history: async.apply(user.getModerationHistory, res.locals.uid),
|
||||
fields: async.apply(user.getUserFields, res.locals.uid, ['banned'])
|
||||
}, function(err, data) {
|
||||
data = _.extend(userData, {
|
||||
if (err) {
|
||||
return next(err);
|
||||
}
|
||||
|
||||
userData = _.extend(userData, {
|
||||
ips: data.ips,
|
||||
history: data.history
|
||||
}, data.fields);
|
||||
@@ -24,7 +32,7 @@ infoController.get = function(req, res, next) {
|
||||
userData.title = '[[pages:account/info]]';
|
||||
userData.breadcrumbs = helpers.buildBreadcrumbs([{text: userData.username, url: '/user/' + userData.userslug}, {text: '[[user:settings]]'}]);
|
||||
|
||||
res.render('account/info', data);
|
||||
res.render('account/info', userData);
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user