Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-01 11:35:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

more privilege changes

Browse Source
This commit is contained in:
Julian Lam
2014-05-12 16:31:33 -04:00
parent 7c8b442dcd
commit d54ecea506
2 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/categoryTools.js
View File

@@ -70,8 +70,32 @@ CategoryTools.privileges = function(cid, uid, callback) {
read: (
(
parseInt(privileges.disabled, 10) !== 1 &&
(privileges.read || privileges.read === null) &&
(privileges['groups:read'] || privileges['groups:read'] === null)
(
(privileges['read'] === null && privileges['groups:read'] === null) ||
privileges['read'] || privileges['groups:read']
)
) ||
privileges.mods ||
privileges.admin
),
"topics:create": (
(
parseInt(privileges.disabled, 10) !== 1 &&
(
(privileges['topics:create'] === null && privileges['groups:topics:create'] === null) ||
privileges['topics:create'] || privileges['groups:topics:create']
)
) ||
privileges.mods ||
privileges.admin
),
"topics:reply": (
(
parseInt(privileges.disabled, 10) !== 1 &&
(
(privileges['topics:reply'] === null && privileges['groups:topics:reply'] === null) ||
privileges['topics:reply'] || privileges['groups:topics:reply']
)
) ||
privileges.mods ||
privileges.admin
@@ -81,6 +105,7 @@ CategoryTools.privileges = function(cid, uid, callback) {
};
}
// console.log(privileges, cid, uid);
callback(err, privileges || null);
});
};

2
src/controllers/topics.js
View File

@@ -26,7 +26,7 @@ topicsController.get = function(req, res, next) {
return next(err);
}
if (!userPrivileges.read) {
if (!userPrivileges.meta.read) {
return next(new Error('[[error:no-privileges]]'));
}