hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

got privilege selection working for users and groups

Browse Source
v1.18.x
Julian Lam 11 years ago
parent 186943ced1
commit 72ca0d6d40
2 changed files with 49 additions and 38 deletions
Show Stats Download Patch File Download Diff File

22
public/src/forum/admin/categories.js
Unescape Escape View File

@ -301,18 +301,18 @@ define(['uploader'], function(uploader) {
Categories.refreshPrivilegeList(cid); Categories.refreshPrivilegeList(cid);
resultsEl.off().on('click', '[data-priv]', function(e) { resultsEl.off().on('click', '[data-priv]', function(e) {
var btnEl = $(this), var anchorEl = $(this),
uid = btnEl.parents('li[data-uid]').attr('data-uid'), uid = anchorEl.parents('li[data-uid]').attr('data-uid'),
privilege = btnEl.attr('data-priv'); privilege = anchorEl.attr('data-priv');
e.preventDefault(); e.preventDefault();
socket.emit('admin.categories.setPrivilege', { socket.emit('admin.categories.setPrivilege', {
cid: cid, cid: cid,
uid: uid, uid: uid,
privilege: privilege, privilege: privilege,
set: !btnEl.hasClass('active') set: !anchorEl.hasClass('active')
}, function(err, privileges) { }, function(err, privileges) {
btnEl.toggleClass('active', privileges[privilege]); anchorEl.toggleClass('active', privileges[privilege]);
Categories.refreshPrivilegeList(cid); Categories.refreshPrivilegeList(cid);
}); });
@ -336,20 +336,20 @@ define(['uploader'], function(uploader) {
}); });
}); });
groupsResultsEl.off().on('click', '[data-gpriv]', function(e) { groupsResultsEl.off().on('click', '[data-priv]', function(e) {
var btnEl = $(this), var anchorEl = $(this),
name = btnEl.parents('tr[data-name]').attr('data-name'), name = anchorEl.parents('li[data-name]').attr('data-name'),
privilege = btnEl.attr('data-gpriv'); privilege = anchorEl.attr('data-priv');
e.preventDefault(); e.preventDefault();
socket.emit('admin.categories.setGroupPrivilege', { socket.emit('admin.categories.setGroupPrivilege', {
cid: cid, cid: cid,
name: name, name: name,
privilege: privilege, privilege: privilege,
set: !btnEl.hasClass('active') set: !anchorEl.hasClass('active')
}, function(err) { }, function(err) {
if (!err) { if (!err) {
btnEl.toggleClass('active'); anchorEl.toggleClass('active');
} }
}); });
}); });

65
src/categoryTools.js
Unescape Escape View File

@ -37,21 +37,30 @@ CategoryTools.exists = function(cid, callback) {
CategoryTools.privileges = function(cid, uid, callback) { CategoryTools.privileges = function(cid, uid, callback) {
async.parallel({ async.parallel({
"disabled": function(next) { disabled: function(next) {
categories.getCategoryField(cid, 'disabled', next); categories.getCategoryField(cid, 'disabled', next);
}, },
"+r": function(next) { read: function(next) {
internals.isMember('cid:' + cid + ':privileges:+r', uid, next); internals.isMember('cid:' + cid + ':privileges:read', uid, next);
}, },
"+w": function(next) { "topics:create": function(next) {
internals.isMember('cid:' + cid + ':privileges:+w', uid, next); internals.isMember('cid:' + cid + ':privileges:topics:create', uid, next);
}, },
"g+r": function(next) { "topics:reply": function(next) {
internals.isMemberOfGroupList('cid:' + cid + ':privileges:g+r', uid, next); internals.isMember('cid:' + cid + ':privileges:topics:reply', uid, next);
},
"g+w": function(next) {
internals.isMemberOfGroupList('cid:' + cid + ':privileges:g+w', uid, next);
}, },
// "+r": function(next) {
// internals.isMember('cid:' + cid + ':privileges:+r', uid, next);
// },
// "+w": function(next) {
// internals.isMember('cid:' + cid + ':privileges:+w', uid, next);
// },
// "g+r": function(next) {
// internals.isMemberOfGroupList('cid:' + cid + ':privileges:g+r', uid, next);
// },
// "g+w": function(next) {
// internals.isMemberOfGroupList('cid:' + cid + ':privileges:g+w', uid, next);
// },
moderator: function(next) { moderator: function(next) {
User.isModerator(uid, cid, next); User.isModerator(uid, cid, next);
}, },
@ -73,15 +82,15 @@ CategoryTools.privileges = function(cid, uid, callback) {
privileges.moderator || privileges.moderator ||
privileges.admin privileges.admin
), ),
write: ( // write: (
( // (
parseInt(privileges.disabled, 10) !== 1 && // parseInt(privileges.disabled, 10) !== 1 &&
(privileges['+w'] || privileges['+w'] === null) && // (privileges['+w'] || privileges['+w'] === null) &&
(privileges['g+w'] || privileges['g+w'] === null) // (privileges['g+w'] || privileges['g+w'] === null)
) || // ) ||
privileges.moderator || // privileges.moderator ||
privileges.admin // privileges.admin
), // ),
editable: privileges.moderator || privileges.admin, editable: privileges.moderator || privileges.admin,
view_deleted: privileges.moderator || privileges.admin, view_deleted: privileges.moderator || privileges.admin,
moderator: privileges.moderator, moderator: privileges.moderator,
@ -92,21 +101,23 @@ CategoryTools.privileges = function(cid, uid, callback) {
CategoryTools.groupPrivileges = function(cid, groupName, callback) { CategoryTools.groupPrivileges = function(cid, groupName, callback) {
async.parallel({ async.parallel({
"g+r": function(next) { "groups:read":function(next) {
internals.isMember('cid:' + cid + ':privileges:g+r', groupName, function(err, isMember){ internals.isMember('cid:' + cid + ':privileges:groups:read', groupName, function(err, isMember){
next(err, !!isMember); next(err, !!isMember);
}); });
}, },
"g+w": function(next) { "groups:topics:create":function(next) {
internals.isMember('cid:' + cid + ':privileges:g+w', groupName, function(err, isMember){ internals.isMember('cid:' + cid + ':privileges:groups:topics:create', groupName, function(err, isMember){
next(err, !!isMember);
});
},
"groups:topics:reply":function(next) {
internals.isMember('cid:' + cid + ':privileges:groups:topics:reply', groupName, function(err, isMember){
next(err, !!isMember); next(err, !!isMember);
}); });
} }
}, function(err, privileges) { }, function(err, privileges) {
callback(err, !privileges ? null : { callback(err, privileges || null);
"g+r": privileges['g+r'],
"g+w": privileges['g+w']
});
}); });
}; };

Write Preview
Loading…
Cancel
Save