From 7cdfe143ab965153437141357764e8c0c0ead1db Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Wed, 25 Mar 2015 17:41:54 -0400
Subject: [PATCH] fixed bug where cid was hardcoded, and switched format back
 to storing group names, not slugs, #2887

---
 public/src/admin/manage/category.js                | 4 ++--
 src/privileges/categories.js                       | 3 +--
 src/views/admin/partials/categories/privileges.tpl | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/public/src/admin/manage/category.js b/public/src/admin/manage/category.js
index 8a77c8747e..4b27ccbb90 100644
--- a/public/src/admin/manage/category.js
+++ b/public/src/admin/manage/category.js
@@ -202,7 +202,7 @@ define('admin/manage/category', [
 				privilege = checkboxEl.parent().attr('data-privilege'),
 				state = checkboxEl.prop('checked'),
 				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) {
 				socket.emit('admin.categories.setPrivilege', {
@@ -225,7 +225,7 @@ define('admin/manage/category', [
 	};
 
 	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) {
 				return app.alertError(err.message);
 			}
diff --git a/src/privileges/categories.js b/src/privileges/categories.js
index f1dd6f6898..d0a78e5438 100644
--- a/src/privileges/categories.js
+++ b/src/privileges/categories.js
@@ -92,12 +92,11 @@ module.exports = function(privileges) {
 							}).map(function(member) {
 								member.privileges = {};
 								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 {
 									name: member.name,
-									slug: member.slug,
 									memberCount: member.memberCount,
 									privileges: member.privileges,
 								};
diff --git a/src/views/admin/partials/categories/privileges.tpl b/src/views/admin/partials/categories/privileges.tpl
index 6e809f819c..c1f6aa8979 100644
--- a/src/views/admin/partials/categories/privileges.tpl
+++ b/src/views/admin/partials/categories/privileges.tpl
@@ -31,7 +31,7 @@
 								<!-- END privileges.labels.groups -->
 							</tr>
 							<!-- BEGIN privileges.groups -->
-							<tr data-group-slug="{privileges.groups.slug}">
+							<tr data-group-name="{privileges.groups.name}">
 								<td>{privileges.groups.name}</td>
 								{function.spawnPrivilegeStates, privileges}
 							</tr>