got privilege selection working for users and groups

public/src/forum/admin/categories.js

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

src/categoryTools.js

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