Merge remote-tracking branch 'origin' into category-whitelisting

This commit is contained in:
Julian Lam
2013-11-27 08:17:23 -05:00
132 changed files with 4223 additions and 4912 deletions

View File

@@ -56,6 +56,8 @@
results.base.count = results.users.length;
results.base.members = results.users;
results.base.deletable = (results.base.gid !== '1');
callback(err, results.base);
});
},
@@ -112,7 +114,9 @@
});
},
destroy: function (gid, callback) {
RDB.hset('gid:' + gid, 'deleted', '1', callback);
if (gid !== 1) {
RDB.hset('gid:' + gid, 'deleted', '1', callback);
}
},
join: function (gid, uid, callback) {
RDB.sadd('gid:' + gid + ':members', uid, callback);