Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-14 19:02:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: #8034

Browse Source
This commit is contained in:
Baris Usakli
2019-11-15 15:27:02 -05:00
parent b3caa40189
commit 0a96c92300
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/controllers/users.js
View File

@@ -138,8 +138,9 @@ usersController.getUsers = async function (set, uid, query) {
const start = Math.max(0, page - 1) * resultsPerPage; const start = Math.max(0, page - 1) * resultsPerPage;
const stop = start + resultsPerPage - 1; const stop = start + resultsPerPage - 1;
const [isAdminOrGlobalMod, canSearch, usersData] = await Promise.all([ const [isAdmin, isGlobalMod, canSearch, usersData] = await Promise.all([
user.isAdminOrGlobalMod(uid), user.isAdministrator(uid),
user.isGlobalModerator(uid),
privileges.global.can('search:users', uid), privileges.global.can('search:users', uid),
usersController.getUsersAndCount(set, uid, start, stop), usersController.getUsersAndCount(set, uid, start, stop),
]); ]);
@@ -150,7 +151,9 @@ usersController.getUsers = async function (set, uid, query) {
userCount: usersData.count, userCount: usersData.count,
title: setToData[set].title || '[[pages:users/latest]]', title: setToData[set].title || '[[pages:users/latest]]',
breadcrumbs: helpers.buildBreadcrumbs(breadcrumbs), breadcrumbs: helpers.buildBreadcrumbs(breadcrumbs),
isAdminOrGlobalMod: isAdminOrGlobalMod, isAdminOrGlobalMod: isAdmin || isGlobalMod,
isAdmin: isAdmin,
isGlobalMod: isGlobalMod,
displayUserSearch: canSearch, displayUserSearch: canSearch,
['section_' + (query.section || 'joindate')]: true, ['section_' + (query.section || 'joindate')]: true,
}; };
@@ -181,8 +184,12 @@ async function render(req, res, data) {
data.maximumInvites = meta.config.maximumInvites; data.maximumInvites = meta.config.maximumInvites;
data.inviteOnly = registrationType === 'invite-only' || registrationType === 'admin-invite-only'; data.inviteOnly = registrationType === 'invite-only' || registrationType === 'admin-invite-only';
data.adminInviteOnly = registrationType === 'admin-invite-only'; data.adminInviteOnly = registrationType === 'admin-invite-only';
data['reputation:disabled'] = meta.config['reputation:disabled'];
data.invites = await user.getInvitesNumber(req.uid); data.invites = await user.getInvitesNumber(req.uid);
data.showInviteButton = req.loggedIn && (
(registrationType === 'invite-only' && (!data.maximumInvites || data.invites < data.maximumInvites)) ||
(registrationType === 'admin-invite-only' && data.isAdmin)
);
data['reputation:disabled'] = meta.config['reputation:disabled'];
res.append('X-Total-Count', data.userCount); res.append('X-Total-Count', data.userCount);
res.render('users', data); res.render('users', data);