Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

do_make_stream_private: Accept a stream object, not a name.

This commit is contained in:
Tim Abbott 2017-01-29 18:44:01 -08:00
parent 0a75480444
commit c74ddb74e9
3 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zerver/lib/actions.py
View File

@ -2057,14 +2057,8 @@ def do_make_stream_public(realm, stream):
stream.invite_only = False
stream.save(update_fields=['invite_only'])
def do_make_stream_private(realm, stream_name):
# type: (Realm, Text) -> None
stream_name = stream_name.strip()
stream = get_stream(stream_name, realm)
if not stream:
raise JsonableError(_('Unknown stream "%s"') % (stream_name,))
def do_make_stream_private(realm, stream):
# type: (Realm, Stream) -> None
stream.invite_only = True
stream.save(update_fields=['invite_only'])

26
zerver/tests/tests.py
View File

@ -945,7 +945,7 @@ class BotTest(ZulipTestCase):
user_profile = get_user_profile_by_email("hamlet@zulip.com")
stream = get_stream("Denmark", user_profile.realm)
self.subscribe_to_stream(user_profile.email, stream.name)
do_make_stream_private(user_profile.realm, "Denmark")
do_make_stream_private(user_profile.realm, stream)
self.assert_num_bots_equal(0)
events = [] # type: List[Dict[str, Any]]
@ -980,8 +980,9 @@ class BotTest(ZulipTestCase):
# type: () -> None
self.login("hamlet@zulip.com")
user_profile = get_user_profile_by_email("hamlet@zulip.com")
stream = get_stream("Denmark", user_profile.realm)
self.unsubscribe_from_stream("hamlet@zulip.com", "Denmark")
do_make_stream_private(user_profile.realm, "Denmark")
do_make_stream_private(user_profile.realm, stream)
bot_info = {
'full_name': 'The Bot of Hamlet',
@ -1006,8 +1007,8 @@ class BotTest(ZulipTestCase):
# type: () -> None
self.login("hamlet@zulip.com")
user_profile = get_user_profile_by_email("hamlet@zulip.com")
self.subscribe_to_stream(user_profile.email, 'Denmark')
do_make_stream_private(user_profile.realm, "Denmark")
stream = self.subscribe_to_stream(user_profile.email, 'Denmark')
do_make_stream_private(user_profile.realm, stream)
self.assert_num_bots_equal(0)
events = [] # type: List[Dict[str, Any]]
@ -1042,8 +1043,9 @@ class BotTest(ZulipTestCase):
# type: () -> None
self.login("hamlet@zulip.com")
user_profile = get_user_profile_by_email("hamlet@zulip.com")
stream = get_stream("Denmark", user_profile.realm)
self.unsubscribe_from_stream("hamlet@zulip.com", "Denmark")
do_make_stream_private(user_profile.realm, "Denmark")
do_make_stream_private(user_profile.realm, stream)
self.assert_num_bots_equal(0)
bot_info = {
@ -1284,8 +1286,8 @@ class BotTest(ZulipTestCase):
# type: () -> None
self.login("hamlet@zulip.com")
user_profile = get_user_profile_by_email("hamlet@zulip.com")
self.subscribe_to_stream(user_profile.email, "Denmark")
do_make_stream_private(user_profile.realm, "Denmark")
stream = self.subscribe_to_stream(user_profile.email, "Denmark")
do_make_stream_private(user_profile.realm, stream)
bot_info = {
'full_name': 'The Bot of Hamlet',
@ -1310,8 +1312,9 @@ class BotTest(ZulipTestCase):
# type: () -> None
self.login("hamlet@zulip.com")
user_profile = get_user_profile_by_email("hamlet@zulip.com")
stream = get_stream("Denmark", user_profile.realm)
self.unsubscribe_from_stream("hamlet@zulip.com", "Denmark")
do_make_stream_private(user_profile.realm, "Denmark")
do_make_stream_private(user_profile.realm, stream)
bot_info = {
'full_name': 'The Bot of Hamlet',
@ -1366,8 +1369,8 @@ class BotTest(ZulipTestCase):
# type: () -> None
self.login("hamlet@zulip.com")
user_profile = get_user_profile_by_email("hamlet@zulip.com")
self.subscribe_to_stream(user_profile.email, "Denmark")
do_make_stream_private(user_profile.realm, "Denmark")
stream = self.subscribe_to_stream(user_profile.email, "Denmark")
do_make_stream_private(user_profile.realm, stream)
bot_info = {
'full_name': 'The Bot of Hamlet',
@ -1391,8 +1394,9 @@ class BotTest(ZulipTestCase):
# type: () -> None
self.login("hamlet@zulip.com")
user_profile = get_user_profile_by_email("hamlet@zulip.com")
stream = get_stream("Denmark", user_profile.realm)
self.unsubscribe_from_stream("hamlet@zulip.com", "Denmark")
do_make_stream_private(user_profile.realm, "Denmark")
do_make_stream_private(user_profile.realm, stream)
bot_info = {
'full_name': 'The Bot of Hamlet',

2
zerver/views/streams.py
View File

@ -98,7 +98,7 @@ def update_stream_backend(request, user_profile, stream_id,
do_rename_stream(user_profile.realm, stream.name, new_name)
if is_private is not None:
if is_private:
do_make_stream_private(user_profile.realm, stream.name)
do_make_stream_private(user_profile.realm, stream)
else:
do_make_stream_public(user_profile.realm, stream)
return json_success()