paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

stream settings: Send all private streams subs to realm admins on load.

Browse Source 
Tweaked by tabbott to simplify the conditionals in actions.py.

Fixes #8695.
This commit is contained in:
YJDave
2018-03-16 16:58:19 +05:30
committed by Tim Abbott
parent 72a440a86d
commit 0281079a39
2 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zerver/lib/actions.py
View File

@@ -3911,8 +3911,8 @@ def gather_subscriptions_helper(user_profile: UserProfile,
subscribers = subscriber_map[stream["id"]] # type: Optional[List[int]]
# Important: don't show the subscribers if the stream is invite only
# and this user isn't on it anymore.
if stream["invite_only"] and not sub["active"]:
# and this user isn't on it anymore (or a realm administrator).
if stream["invite_only"] and not (sub["active"] or user_profile.is_realm_admin):
subscribers = None
stream_dict = {'name': stream["name"],
@@ -3957,7 +3957,7 @@ def gather_subscriptions_helper(user_profile: UserProfile,
stream["date_created"],
recent_traffic),
'description': stream['description']}
if is_public:
if is_public or user_profile.is_realm_admin:
subscribers = subscriber_map[stream["id"]]
if subscribers is not None:
stream_dict['subscribers'] = subscribers