diff options
| author | Jason Robinson <jasonr@matrix.org> | 2019-07-22 16:28:51 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-22 16:28:51 +0300 |
| commit | 8e513e7afc5c86b95e7cd87cc411379ebbc71905 (patch) | |
| tree | 2161533eafb9993f73f6c11af8080d93d39c8a1e /synapse | |
| parent | Fix stack overflow in Keyring (#5724) (diff) | |
| parent | Add `user_type` to returned fields in admin API user list endpoints (diff) | |
| download | synapse-8e513e7afc5c86b95e7cd87cc411379ebbc71905.tar.xz | |
Merge pull request #5731 from matrix-org/jaywink/admin-user-list-user-type
Add `user_type` to returned fields in admin API user list endpoints
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/storage/__init__.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py index 6b0ca80087..86a333a919 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py @@ -469,7 +469,7 @@ class DataStore( return self._simple_select_list( table="users", keyvalues={}, - retcols=["name", "password_hash", "is_guest", "admin"], + retcols=["name", "password_hash", "is_guest", "admin", "user_type"], desc="get_users", ) @@ -494,7 +494,7 @@ class DataStore( orderby=order, start=start, limit=limit, - retcols=["name", "password_hash", "is_guest", "admin"], + retcols=["name", "password_hash", "is_guest", "admin", "user_type"], ) count = yield self.runInteraction("get_users_paginate", self.get_user_count_txn) retval = {"users": users, "total": count} @@ -514,7 +514,7 @@ class DataStore( table="users", term=term, col="name", - retcols=["name", "password_hash", "is_guest", "admin"], + retcols=["name", "password_hash", "is_guest", "admin", "user_type"], desc="search_users", ) |