Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

management: Fix obsolete check for double-adding a permission. 

The .has_perm logic in this management command dates from use of
django-guardian that ended years ago.
This commit is contained in:
Tim Abbott 2019-07-08 13:43:54 -07:00
parent 9e9ddf464e
commit e87fcd0789
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zerver/management/commands/knight.py
View File

@ -41,7 +41,8 @@ ONLY perform this on customer request from an authorized person.
user = self.get_user(email, realm)
if options['grant']:
if user.has_perm(options['permission'], user.realm):
if (user.is_realm_admin and options['permission'] == "administer" or
user.is_api_super_user and options['permission'] == "api_super_user"):
raise CommandError("User already has permission for this realm.")
else:
if options['ack']:
@ -51,7 +52,8 @@ ONLY perform this on customer request from an authorized person.
print("Would have granted %s %s rights for %s" % (
email, options['permission'], user.realm.string_id))
else:
if user.has_perm(options['permission'], user.realm):
if (user.is_realm_admin and options['permission'] == "administer" or
user.is_api_super_user and options['permission'] == "api_super_user"):
if options['ack']:
do_change_is_admin(user, False, permission=options['permission'])
print("Done!")