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

fixed bug where cid was hardcoded, and switched format back to storing group names, not slugs, #2887

Browse Source
This commit is contained in:
Julian Lam
2015-03-25 17:41:54 -04:00
parent 4f2c7382c5
commit 7cdfe143ab
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/src/admin/manage/category.js
View File

@@ -202,7 +202,7 @@ define('admin/manage/category', [
privilege = checkboxEl.parent().attr('data-privilege'), privilege = checkboxEl.parent().attr('data-privilege'),
state = checkboxEl.prop('checked'), state = checkboxEl.prop('checked'),
rowEl = checkboxEl.parents('tr'), rowEl = checkboxEl.parents('tr'),
member = rowEl.attr('data-group-slug') || rowEl.attr('data-uid'); member = rowEl.attr('data-group-name') || rowEl.attr('data-uid');
if (member) { if (member) {
socket.emit('admin.categories.setPrivilege', { socket.emit('admin.categories.setPrivilege', {
@@ -225,7 +225,7 @@ define('admin/manage/category', [
}; };
Category.refreshPrivilegeTable = function() { Category.refreshPrivilegeTable = function() {
socket.emit('admin.categories.getPrivilegeSettings', 2, function(err, privileges) { socket.emit('admin.categories.getPrivilegeSettings', ajaxify.variables.get('cid'), function(err, privileges) {
if (err) { if (err) {
return app.alertError(err.message); return app.alertError(err.message);
} }

3
src/privileges/categories.js
View File

@@ -92,12 +92,11 @@ module.exports = function(privileges) {
}).map(function(member) { }).map(function(member) {
member.privileges = {}; member.privileges = {};
for(var x=0,numPrivs=privileges.length;x<numPrivs;x++) { for(var x=0,numPrivs=privileges.length;x<numPrivs;x++) {
member.privileges[privileges[x]] = memberSets[x].indexOf(member.slug) !== -1 member.privileges[privileges[x]] = memberSets[x].indexOf(member.name) !== -1
} }
return { return {
name: member.name, name: member.name,
slug: member.slug,
memberCount: member.memberCount, memberCount: member.memberCount,
privileges: member.privileges, privileges: member.privileges,
}; };

2
src/views/admin/partials/categories/privileges.tpl
View File

@@ -31,7 +31,7 @@
<!-- END privileges.labels.groups --> <!-- END privileges.labels.groups -->
</tr> </tr>
<!-- BEGIN privileges.groups --> <!-- BEGIN privileges.groups -->
<tr data-group-slug="{privileges.groups.slug}"> <tr data-group-name="{privileges.groups.name}">
<td>{privileges.groups.name}</td> <td>{privileges.groups.name}</td>
{function.spawnPrivilegeStates, privileges} {function.spawnPrivilegeStates, privileges}
</tr> </tr>