Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-23 17:00:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #6276

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2018-01-22 15:01:10 -05:00
parent 0cefa56a0b
commit 08562ad9cc
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/controllers/accounts/helpers.js
View File

@@ -62,6 +62,9 @@ helpers.getUserDataByUserSlug = function (userslug, callerUID, callback) {
sso: function (next) { sso: function (next) {
plugins.fireHook('filter:auth.list', { uid: uid, associations: [] }, next); plugins.fireHook('filter:auth.list', { uid: uid, associations: [] }, next);
}, },
canEdit: function (next) {
privileges.users.canEdit(callerUID, uid, next);
},
canBanUser: function (next) { canBanUser: function (next) {
privileges.users.canBanUser(callerUID, uid, next); privileges.users.canBanUser(callerUID, uid, next);
}, },
@@ -113,7 +116,7 @@ helpers.getUserDataByUserSlug = function (userslug, callerUID, callback) {
userData.isAdminOrGlobalModerator = isAdmin || isGlobalModerator; userData.isAdminOrGlobalModerator = isAdmin || isGlobalModerator;
userData.isAdminOrGlobalModeratorOrModerator = isAdmin || isGlobalModerator || isModerator; userData.isAdminOrGlobalModeratorOrModerator = isAdmin || isGlobalModerator || isModerator;
userData.isSelfOrAdminOrGlobalModerator = isSelf || isAdmin || isGlobalModerator; userData.isSelfOrAdminOrGlobalModerator = isSelf || isAdmin || isGlobalModerator;
userData.canEdit = isAdmin || (isGlobalModerator && !results.isTargetAdmin); userData.canEdit = results.canEdit;
userData.canBan = results.canBanUser; userData.canBan = results.canBanUser;
userData.canChangePassword = isAdmin || (isSelf && parseInt(meta.config['password:disableEdit'], 10) !== 1); userData.canChangePassword = isAdmin || (isSelf && parseInt(meta.config['password:disableEdit'], 10) !== 1);
userData.isSelf = isSelf; userData.isSelf = isSelf;

10
src/privileges/users.js
View File

@@ -141,9 +141,13 @@ module.exports = function (privileges) {
}, next); }, next);
}, },
function (results, next) { function (results, next) {
var canEdit = results.isAdmin || (results.isGlobalMod && !results.isTargetAdmin); results.canEdit = results.isAdmin || (results.isGlobalMod && !results.isTargetAdmin);
results.callerUid = callerUid;
next(null, canEdit); results.uid = uid;
plugins.fireHook('filter:user.canEdit', results, next);
},
function (data, next) {
next(null, data.canEdit);
}, },
], callback); ], callback);
}; };