Merge pull request getredash#2120 from negibouze/prevent-remove-self

prevent remove self
KiiCorp · Dec 5, 2017 · 3d0080a · 3d0080a
2 parents 2c39028 + 4dd8f8c
commit 3d0080a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/client/app/pages/groups/show.html b/client/app/pages/groups/show.html
@@ -30,7 +30,7 @@
         <tbody>
         <tr ng-repeat="member in members">
           <td width="50px"><img ng-src="{{member.gravatar_url}}" height="40px"/></td>
-          <td>{{member.name}} <button class="pull-right btn btn-sm btn-danger" ng-click="removeMember(member)" ng-if="currentUser.isAdmin">Remove</button></td>
+          <td>{{member.name}} <button class="pull-right btn btn-sm btn-danger" ng-click="removeMember(member)" ng-if="currentUser.isAdmin && (group.type != 'builtin' || currentUser.id != member.id)">Remove</button></td>
         </tr>
         </tbody>
       </table>