diff options
author | Dan Callahan <danc@element.io> | 2021-10-27 20:04:00 +0100 |
---|---|---|
committer | Dan Callahan <danc@element.io> | 2021-10-27 20:04:00 +0100 |
commit | 0dffa9d0e096e5ff04768b2e06ce4acf92120486 (patch) | |
tree | aa501e65702a3e3fb179c3a0c37dc15543637f72 /synapse/rest/admin/users.py | |
parent | Changelog (diff) | |
parent | Annotate `log_function` decorator (#10943) (diff) | |
download | synapse-0dffa9d0e096e5ff04768b2e06ce4acf92120486.tar.xz |
Merge remote-tracking branch 'origin/develop' into shellcheck
Fixes a merge conflict with debian/changelog Signed-off-by: Dan Callahan <danc@element.io>
Diffstat (limited to 'synapse/rest/admin/users.py')
-rw-r--r-- | synapse/rest/admin/users.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/rest/admin/users.py b/synapse/rest/admin/users.py index c0bebc3cf0..d14fafbbc9 100644 --- a/synapse/rest/admin/users.py +++ b/synapse/rest/admin/users.py @@ -326,6 +326,9 @@ class UserRestServletV2(RestServlet): target_user.to_string() ) + if "user_type" in body: + await self.store.set_user_type(target_user, user_type) + user = await self.admin_handler.get_user(target_user) assert user is not None |