diff --git a/kallithea/controllers/admin/repo_groups.py b/kallithea/controllers/admin/repo_groups.py --- a/kallithea/controllers/admin/repo_groups.py +++ b/kallithea/controllers/admin/repo_groups.py @@ -90,13 +90,6 @@ class RepoGroupsController(base.BaseCont return data - def _revoke_perms_on_yourself(self, form_result): - _up = [u for u in form_result['perms_updates'] if request.authuser.username == u[0]] - _new = [u for u in form_result['perms_new'] if request.authuser.username == u[0]] - if _new and _new[0][1] != 'group.admin' or _up and _up[0][1] != 'group.admin': - return True - return False - def index(self, format='html'): _list = db.RepoGroup.query(sorted=True).all() group_iter = RepoGroupList(_list, perm_level='admin') @@ -349,11 +342,6 @@ class RepoGroupsController(base.BaseCont c.repo_group = db.RepoGroup.guess_instance(group_name) valid_recursive_choices = ['none', 'repos', 'groups', 'all'] form_result = RepoGroupPermsForm(valid_recursive_choices)().to_python(request.POST) - if not request.authuser.is_admin: - if self._revoke_perms_on_yourself(form_result): - msg = _('Cannot revoke permission for yourself as admin') - webutils.flash(msg, category='warning') - raise HTTPFound(location=url('edit_repo_group_perms', group_name=group_name)) recursive = form_result['recursive'] # iterate over all members(if in recursive mode) of this groups and # set the permissions ! @@ -379,11 +367,6 @@ class RepoGroupsController(base.BaseCont elif obj_type == 'user_group': obj_id = safe_int(request.POST.get('user_group_id')) - if not request.authuser.is_admin: - if obj_type == 'user' and request.authuser.user_id == obj_id: - msg = _('Cannot revoke permission for yourself as admin') - webutils.flash(msg, category='warning') - raise Exception('revoke admin permission on self') recursive = request.POST.get('recursive', 'none') if obj_type == 'user': RepoGroupModel().delete_permission(repo_group=group_name, diff --git a/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html b/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html --- a/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html +++ b/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html @@ -12,9 +12,7 @@ ## USERS %for r2p in c.repo_group.repo_group_to_perm: - ##forbid revoking permission from yourself, except if you're an super admin - %if request.authuser.user_id != r2p.user.user_id or request.authuser.is_admin: ${h.radio('u_perm_%s' % r2p.user.username,'group.none')} ${h.radio('u_perm_%s' % r2p.user.username,'group.read')} ${h.radio('u_perm_%s' % r2p.user.username,'group.write')} @@ -34,17 +32,6 @@ %endif - %else: - ${h.radio('u_perm_%s' % r2p.user.username,'group.none', disabled="disabled")} - ${h.radio('u_perm_%s' % r2p.user.username,'group.read', disabled="disabled")} - ${h.radio('u_perm_%s' % r2p.user.username,'group.write', disabled="disabled")} - ${h.radio('u_perm_%s' % r2p.user.username,'group.admin', disabled="disabled")} - - ${h.gravatar(r2p.user.email, cls="perm-gravatar", size=14)} - ${r2p.user.username if r2p.user.username != 'default' else _('Default')} - - ${_('Admin')} - %endif %endfor