From 4f716d4ad8acf85588ec545c6fe3366becd7543a Mon Sep 17 00:00:00 2001 From: sahil839 Date: Fri, 23 Apr 2021 01:33:03 +0530 Subject: [PATCH] management: Include moderator option in change_user_role command. We now allow to change a user role to moderator and to change role from moderator to any other role using change_user_role command. --- zerver/management/commands/change_user_role.py | 11 ++++++++++- zerver/models.py | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/zerver/management/commands/change_user_role.py b/zerver/management/commands/change_user_role.py index 209cd222f4..a2642bb430 100644 --- a/zerver/management/commands/change_user_role.py +++ b/zerver/management/commands/change_user_role.py @@ -23,7 +23,15 @@ ONLY perform this on customer request from an authorized person. parser.add_argument( "new_role", metavar="", - choices=["owner", "admin", "member", "guest", "can_forge_sender", "can_create_users"], + choices=[ + "owner", + "admin", + "moderator", + "member", + "guest", + "can_forge_sender", + "can_create_users", + ], help="new role of the user", ) parser.add_argument( @@ -43,6 +51,7 @@ ONLY perform this on customer request from an authorized person. user_role_map = { "owner": UserProfile.ROLE_REALM_OWNER, "admin": UserProfile.ROLE_REALM_ADMINISTRATOR, + "moderator": UserProfile.ROLE_MODERATOR, "member": UserProfile.ROLE_MEMBER, "guest": UserProfile.ROLE_GUEST, } diff --git a/zerver/models.py b/zerver/models.py index de4eb3537a..fe0d6822b7 100644 --- a/zerver/models.py +++ b/zerver/models.py @@ -1406,6 +1406,7 @@ class UserProfile(AbstractBaseUser, PermissionsMixin): ROLE_ID_TO_NAME_MAP = { ROLE_REALM_OWNER: gettext_lazy("Organization owner"), ROLE_REALM_ADMINISTRATOR: gettext_lazy("Organization administrator"), + ROLE_MODERATOR: gettext_lazy("Moderator"), ROLE_MEMBER: gettext_lazy("Member"), ROLE_GUEST: gettext_lazy("Guest"), }