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

gather_subscriptions: Use the colors from the Subscription table.

Browse Source 
(imported from commit c23829ad4141a97c61e21b970e5031eae20e24b4)
This commit is contained in:
Tim Abbott
2013-03-29 16:06:39 -04:00
parent a701083f71
commit f6affa8802
1 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
zephyr/lib/actions.py
View File

@@ -726,41 +726,25 @@ def do_finish_tutorial(user_profile):
do_add_subscription(user_profile, stream) do_add_subscription(user_profile, stream)
def gather_subscriptions(user_profile): def gather_subscriptions(user_profile):
# This is a little awkward because the StreamColor table has foreign keys # For now, don't display subscriptions for private messages.
# to Subscription, but not vice versa, and not all Subscriptions have a subs = Subscription.objects.select_related().filter(
# StreamColor.
#
# We could do this with a single OUTER JOIN query but Django's ORM does
# not provide a simple way to specify one.
# For now, don't display the subscription for your ability to receive personals.
subs = Subscription.objects.filter(
user_profile = user_profile, user_profile = user_profile,
active = True, active = True,
recipient__type = Recipient.STREAM) recipient__type = Recipient.STREAM)
with_color = StreamColor.objects.filter(subscription__in = subs).select_related()
no_color = subs.exclude(id__in = with_color.values('subscription_id')).select_related()
stream_ids = [sc.subscription.recipient.type_id for sc in with_color] + \ stream_ids = [sub.recipient.type_id for sub in subs]
[sub.recipient.type_id for sub in no_color]
stream_hash = {} stream_hash = {}
for stream in Stream.objects.filter(id__in=stream_ids): for stream in Stream.objects.filter(id__in=stream_ids):
stream_hash[stream.id] = (stream.name, stream.invite_only) stream_hash[stream.id] = (stream.name, stream.invite_only)
result = [] result = []
for sc in with_color: for sub in subs:
(stream_name, invite_only) = stream_hash[sc.subscription.recipient.type_id]
result.append({'name': stream_name,
'in_home_view': sc.subscription.in_home_view,
'invite_only': invite_only,
'color': sc.color})
for sub in no_color:
(stream_name, invite_only) = stream_hash[sub.recipient.type_id] (stream_name, invite_only) = stream_hash[sub.recipient.type_id]
result.append({'name': stream_name, result.append({'name': stream_name,
'in_home_view': sub.in_home_view, 'in_home_view': sub.in_home_view,
'invite_only': invite_only, 'invite_only': invite_only,
'color': StreamColor.DEFAULT_STREAM_COLOR}) 'color': sub.color})
return sorted(result) return sorted(result)