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

get_{display,log}_recipient: Use a join query

Browse Source 
(imported from commit 1278f46655760842e21a62ca5add891515ee1945)
This commit is contained in:
Keegan McAllister
2012-11-13 13:56:32 -05:00
parent c8e87e0e6a
commit a954277647
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zephyr/models.py
View File

@@ -31,8 +31,7 @@ def get_display_recipient(recipient):
stream = Stream.objects.get(id=recipient.type_id) stream = Stream.objects.get(id=recipient.type_id)
return stream.name return stream.name
elif recipient.type == Recipient.HUDDLE: elif recipient.type == Recipient.HUDDLE:
user_profile_list = [UserProfile.objects.select_related().get(user=s.user_profile) for s in user_profile_list = UserProfile.objects.filter(subscription__recipient=recipient).select_related()
Subscription.objects.filter(recipient=recipient)]
return [{'email': user_profile.user.email, return [{'email': user_profile.user.email,
'full_name': user_profile.full_name, 'full_name': user_profile.full_name,
'short_name': user_profile.short_name} for user_profile in user_profile_list] 'short_name': user_profile.short_name} for user_profile in user_profile_list]
@@ -53,8 +52,7 @@ def get_log_recipient(recipient):
stream = Stream.objects.get(id=recipient.type_id) stream = Stream.objects.get(id=recipient.type_id)
return stream.name return stream.name
user_profile_list = [UserProfile.objects.select_related().get(user=s.user_profile) for s in user_profile_list = UserProfile.objects.filter(subscription__recipient=recipient).select_related()
Subscription.objects.filter(recipient=recipient)]
return [{'email': user_profile.user.email, return [{'email': user_profile.user.email,
'full_name': user_profile.full_name, 'full_name': user_profile.full_name,
'short_name': user_profile.short_name} for user_profile in user_profile_list] 'short_name': user_profile.short_name} for user_profile in user_profile_list]