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

more fixed to privs, and ACP modal

Browse Source
This commit is contained in:
Julian Lam
2014-05-12 17:16:29 -04:00
parent d54ecea506
commit 87f4566e06
6 changed files with 41 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
public/src/forum/admin/categories.js
View File

@@ -361,50 +361,22 @@ define(['uploader'], function(uploader) {
Categories.refreshPrivilegeList = function (cid) {
var modalEl = $('#category-permissions-modal'),
readMembers = modalEl.find('#category-permissions-read'),
writeMembers = modalEl.find('#category-permissions-write'),
moderatorsEl = modalEl.find('#category-permissions-mods');
memberList = $('.members');
socket.emit('admin.categories.getPrivilegeSettings', cid, function(err, privilegeList) {
var readLength = privilegeList['+r'].length,
writeLength = privilegeList['+w'].length,
modLength = privilegeList.mods.length,
var membersLength = privilegeList.length,
liEl, x, userObj;
readMembers.html('');
if (readLength > 0) {
for(x = 0; x < readLength; x++) {
userObj = privilegeList['+r'][x];
memberList.html('');
if (membersLength > 0) {
for(x = 0; x < membersLength; x++) {
userObj = privilegeList[x];
liEl = $('<li/>').attr('data-uid', userObj.uid).html('<img src="' + userObj.picture + '" title="' + userObj.username + '" />');
readMembers.append(liEl);
memberList.append(liEl);
}
} else {
liEl = $('<li/>').addClass('empty').html('All users can read and see this category');
readMembers.append(liEl);
}
writeMembers.html('');
if (writeLength > 0) {
for(x=0;x<writeLength;x++) {
userObj = privilegeList['+w'][x];
liEl = $('<li />').attr('data-uid', userObj.uid).html('<img src="' + userObj.picture + '" title="' + userObj.username + '" />');
writeMembers.append(liEl);
}
} else {
liEl = $('<li />').addClass('empty').html('All users can write to this category');
writeMembers.append(liEl);
}
moderatorsEl.html('');
if (modLength > 0) {
for(x = 0;x < modLength; x++) {
userObj = privilegeList.mods[x];
liEl = $('<li />').attr('data-uid', userObj.uid).html('<img src="' + userObj.picture + '" title="' + userObj.username + '" />');
moderatorsEl.append(liEl);
}
} else {
liEl = $('<li />').addClass('empty').html('No moderators');
moderatorsEl.append(liEl);
liEl = $('<li/>').addClass('empty').html('All users can read and post, and reply to topics in this category');
memberList.append(liEl);
}
});
};

10
src/postTools.js
View File

@@ -61,10 +61,12 @@ var winston = require('winston'),
}
callback(null, {
read: results.topicPrivs.read,
editable: results.topicPrivs.editable || results.isOwner || results.hasEnoughRep,
view_deleted: results.topicPrivs.view_deleted || results.isOwner || results.hasEnoughRep,
move: results.topicPrivs.admin || results.topicPrivs.moderator
meta: {
read: results.topicPrivs.meta.read,
editable: results.topicPrivs.meta.editable || results.isOwner || results.hasEnoughRep,
view_deleted: results.topicPrivs.meta.view_deleted || results.isOwner || results.hasEnoughRep,
move: results.topicPrivs.admin || results.topicPrivs.mods
}
});
});
};

61
src/socket.io/admin/categories.js
View File

@@ -69,50 +69,31 @@ Categories.setPrivilege = function(socket, data, callback) {
};
Categories.getPrivilegeSettings = function(socket, cid, callback) {
async.parallel({
"+r": function(next) {
groups.get('cid:' + cid + ':privileges:+r', { expand: true }, function(err, groupObj) {
var privileges = ['read', 'topics:create', 'topics:reply', 'mods'];
async.reduce(privileges, [], function(members, privilege, next) {
groups.get('cid:' + cid + ':privileges:' + privilege, { expand: true }, function(err, groupObj) {
if (!err) {
next.apply(this, arguments);
} else {
next(null, {
members: []
});
}
});
},
"+w": function(next) {
groups.get('cid:' + cid + ':privileges:+w', { expand: true }, function(err, groupObj) {
if (!err) {
next.apply(this, arguments);
} else {
next(null, {
members: []
});
}
});
},
"mods": function(next) {
groups.get('cid:' + cid + ':privileges:mods', { expand: true }, function(err, groupObj) {
if (!err) {
next.apply(this, arguments);
} else {
next(null, {
members: []
});
}
});
}
}, function(err, data) {
if(err) {
return callback(err);
members = members.concat(groupObj.members);
}
callback(null, {
"+r": data['+r'].members,
"+w": data['+w'].members,
"mods": data.mods.members
next(null, members);
});
}, function(err, members) {
// Remove duplicates
var present = [],
x = members.length,
uid;
while(x--) {
uid = parseInt(members[x].uid, 10);
if (present.indexOf(uid) !== -1) {
members.splice(x, 1);
} else {
present.push(uid);
}
}
callback(err, members);
});
};

2
src/socket.io/posts.js
View File

@@ -130,7 +130,7 @@ SocketPosts.getRawPost = function(socket, pid, callback) {
postTools.privileges(pid, socket.uid, next);
},
function(privileges, next) {
if (!privileges || !privileges.read) {
if (!privileges || !privileges.meta.read) {
return next(new Error('[[error:no-privileges]]'));
}
posts.getPostFields(pid, ['content', 'deleted'], next);

2
src/topics.js
View File

@@ -133,7 +133,7 @@ var async = require('async'),
async.filter(tids, function(tid, next) {
threadTools.privileges(tid, uid, function(err, privileges) {
next(!err && privileges.read);
next(!err && privileges.meta.read);
});
}, function(tids) {
Topics.getTopicsByTids(tids, uid, function(err, topicData) {

2
src/topics/unread.js
View File

@@ -50,7 +50,7 @@ module.exports = function(Topics) {
async.filter(newtids, function(tid, next) {
threadTools.privileges(tid, uid, function(err, privileges) {
next(!err && privileges.read);
next(!err && privileges.meta.read);
});
}, function(newtids) {
unreadTids.push.apply(unreadTids, newtids);