paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-06 23:13:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Send user_id to the client in more places.

Browse Source 
This commit touches:

    realm_bot/add
    realm_user/add
    page_params.bot_list
    page_params.people_list
This commit is contained in:
Steve Howell
2016-10-25 18:35:32 -07:00
committed by Tim Abbott
parent 4fe5fc849e
commit 7883cecf28
4 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
zerver/lib/actions.py
View File

@@ -269,6 +269,7 @@ def notify_created_user(user_profile):
# type: (UserProfile) -> None
event = dict(type="realm_user", op="add",
person=dict(email=user_profile.email,
user_id=user_profile.id,
is_admin=user_profile.is_realm_admin,
full_name=user_profile.full_name,
is_bot=user_profile.is_bot))
@@ -288,6 +289,7 @@ def notify_created_bot(user_profile):
event = dict(type="realm_bot", op="add",
bot=dict(email=user_profile.email,
user_id=user_profile.id,
full_name=user_profile.full_name,
api_key=user_profile.api_key,
default_sending_stream=default_sending_stream_name,
@@ -2784,6 +2786,7 @@ def get_status_dict(requesting_user_profile):
def get_realm_user_dicts(user_profile):
# type: (UserProfile) -> List[Dict[str, text_type]]
return [{'email' : userdict['email'],
'user_id' : userdict['id'],
'is_admin' : userdict['is_realm_admin'],
'is_bot' : userdict['is_bot'],
'full_name' : userdict['full_name']}