paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-16 03:41:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make gather_subscriptions pass along whether or not a stream is invite-only.

Browse Source 
(imported from commit f71c171185a0552dba4917967d3feffb9c92c4fe)
This commit is contained in:
Waseem Daher
2013-02-05 13:38:47 -05:00
parent 71e98baad4
commit 66850b5dcd
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
zephyr/lib/actions.py
View File

@@ -4,7 +4,7 @@ from zephyr.lib.context_managers import lockfile
from zephyr.models import Realm, Stream, UserProfile, UserActivity, \ from zephyr.models import Realm, Stream, UserProfile, UserActivity, \
Subscription, Recipient, Message, UserMessage, \ Subscription, Recipient, Message, UserMessage, \
DefaultStream, StreamColor, \ DefaultStream, StreamColor, \
MAX_MESSAGE_LENGTH, get_client, get_display_recipient MAX_MESSAGE_LENGTH, get_client, get_display_recipient, get_stream
from django.db import transaction, IntegrityError from django.db import transaction, IntegrityError
from zephyr.lib.initial_password import initial_password from zephyr.lib.initial_password import initial_password
from zephyr.lib.cache import cache_with_key from zephyr.lib.cache import cache_with_key
@@ -373,12 +373,18 @@ def gather_subscriptions(user_profile):
with_color = StreamColor.objects.filter(subscription__in = subs).select_related() with_color = StreamColor.objects.filter(subscription__in = subs).select_related()
no_color = subs.exclude(id__in = with_color.values('subscription_id')).select_related() no_color = subs.exclude(id__in = with_color.values('subscription_id')).select_related()
result = [{'name': get_display_recipient(sc.subscription.recipient), result = []
for sc in with_color:
stream_name = get_display_recipient(sc.subscription.recipient)
result.append({'name': stream_name,
'in_home_view': sc.subscription.in_home_view, 'in_home_view': sc.subscription.in_home_view,
'color': sc.color} for sc in with_color] 'invite_only': get_stream(stream_name, user_profile.realm).invite_only,
result.extend({'name': get_display_recipient(sub.recipient), 'color': sc.color})
for sub in no_color:
stream_name = get_display_recipient(sub.recipient)
result.append({'name': stream_name,
'in_home_view': sub.in_home_view, 'in_home_view': sub.in_home_view,
'color': StreamColor.DEFAULT_STREAM_COLOR} for sub in no_color) 'invite_only': get_stream(stream_name, user_profile.realm).invite_only,
'color': StreamColor.DEFAULT_STREAM_COLOR})
return sorted(result) return sorted(result)