summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-02-19 11:50:36 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-02-19 11:50:36 +0000
commita47d9525c710d21a86fe7fc6386e762e65a047cb (patch)
treefc650b8ba18b23615b3cbfc91e3c3b245befe941 /synapse
parentUpdate changelog.d/5730.misc (diff)
parentMerge pull request #5731 from matrix-org/jaywink/admin-user-list-user-type (diff)
downloadsynapse-a47d9525c710d21a86fe7fc6386e762e65a047cb.tar.xz
Merge pull request #5731 from matrix-org/jaywink/admin-user-list-user-type
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/__init__.py6
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", )