From a5226c942395ee72aaae0aab05d40328360f987a Mon Sep 17 00:00:00 2001 From: pichalite Date: Wed, 22 Jul 2015 17:10:17 -0700 Subject: [PATCH 1/3] don't display "Leave Group" button for admins in "administrators" system group on groups details page --- public/src/modules/helpers.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/public/src/modules/helpers.js b/public/src/modules/helpers.js index e8532a83ee..66569da68f 100644 --- a/public/src/modules/helpers.js +++ b/public/src/modules/helpers.js @@ -116,7 +116,11 @@ // Groups helpers helpers.membershipBtn = function(groupObj) { if (groupObj.isMember) { - return ''; + if (groupObj.name==='administrators') { + return ''; + } else { + return ''; + } } else { if (groupObj.isPending) { return ''; From d2bbca1de1cf97c021c5cddd72d8d943107f8e60 Mon Sep 17 00:00:00 2001 From: pichalite Date: Fri, 24 Jul 2015 08:58:00 -0700 Subject: [PATCH 2/3] don't display leave/join buttons for admin group --- public/src/modules/helpers.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/public/src/modules/helpers.js b/public/src/modules/helpers.js index 66569da68f..59fd69abc6 100644 --- a/public/src/modules/helpers.js +++ b/public/src/modules/helpers.js @@ -115,21 +115,21 @@ // Groups helpers helpers.membershipBtn = function(groupObj) { - if (groupObj.isMember) { - if (groupObj.name==='administrators') { + if (groupObj.name==='administrators') { return ''; - } else { + } else { + if (groupObj.isMember) { return ''; - } - } else { - if (groupObj.isPending) { - return ''; - } else if (groupObj.isInvited) { - return ''; } else { - return ''; + if (groupObj.isPending) { + return ''; + } else if (groupObj.isInvited) { + return ''; + } else { + return ''; + } } - } + } }; helpers.spawnPrivilegeStates = function(member, privileges) { From eb5be2f6719b9575293e39b6ded5b483a0e5fd2a Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 28 Jul 2015 07:49:28 -0400 Subject: [PATCH 3/3] fixed some whitespace issues and made the admin check return early, in its own block --- public/src/modules/helpers.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/public/src/modules/helpers.js b/public/src/modules/helpers.js index 59fd69abc6..305d9d02f1 100644 --- a/public/src/modules/helpers.js +++ b/public/src/modules/helpers.js @@ -115,21 +115,21 @@ // Groups helpers helpers.membershipBtn = function(groupObj) { - if (groupObj.name==='administrators') { - return ''; - } else { - if (groupObj.isMember) { - return ''; + if (groupObj.name === 'administrators') { + return ''; + } + + if (groupObj.isMember) { + return ''; + } else { + if (groupObj.isPending) { + return ''; + } else if (groupObj.isInvited) { + return ''; } else { - if (groupObj.isPending) { - return ''; - } else if (groupObj.isInvited) { - return ''; - } else { - return ''; - } + return ''; } - } + } }; helpers.spawnPrivilegeStates = function(member, privileges) {