From a1839d90fdd8e02e87b988e3bcd160bb839c6f07 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Sat, 23 Nov 2013 14:52:59 -0500 Subject: [PATCH] prevent admin group from being deleted, closes #530 --- public/templates/admin/groups.tpl | 4 +++- src/groups.js | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/public/templates/admin/groups.tpl b/public/templates/admin/groups.tpl index 269c104bea..cfd067f477 100644 --- a/public/templates/admin/groups.tpl +++ b/public/templates/admin/groups.tpl @@ -7,12 +7,14 @@
  • -
    +

    {groups.name}

    {groups.description}

    + +
    diff --git a/src/groups.js b/src/groups.js index fde915f448..d92865978f 100644 --- a/src/groups.js +++ b/src/groups.js @@ -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); }); }, @@ -103,7 +105,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);