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

streams: Eliminate last use of get_stream in views.

Browse Source
This commit is contained in:
Tim Abbott
2017-01-29 21:42:09 -08:00
parent 4d3e97f304
commit 884aa2b184
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zerver/views/streams.py
View File

@@ -12,14 +12,14 @@ from zerver.decorator import authenticated_json_post_view, \
get_user_profile_by_email, require_realm_admin, to_non_negative_int
from zerver.lib.actions import bulk_remove_subscriptions, \
do_change_subscription_property, internal_prep_message, \
check_stream_name, gather_subscriptions, subscribed_to_stream, \
gather_subscriptions, subscribed_to_stream, \
bulk_add_subscriptions, do_send_messages, get_subscriber_emails, do_rename_stream, \
do_deactivate_stream, do_change_stream_invite_only, do_add_default_stream, \
do_change_stream_description, do_get_streams, \
do_remove_default_stream, get_topic_history_for_stream
from zerver.lib.response import json_success, json_error, json_response
from zerver.lib.streams import access_stream_by_id, access_stream_by_name, \
filter_stream_authorization, list_to_streams
check_stream_name_available, filter_stream_authorization, list_to_streams
from zerver.lib.validator import check_string, check_list, check_dict, \
check_bool, check_variable_type
from zerver.models import UserProfile, Stream, Realm, Subscription, \
@@ -99,11 +99,9 @@ def update_stream_backend(request, user_profile, stream_id,
if new_name is not None:
new_name = new_name.strip()
# Will raise if the new name has invalid characters.
check_stream_name(new_name)
if stream.name.lower() == new_name.lower():
return json_error(_("Stream already has that name!"))
if get_stream(new_name, user_profile.realm) is not None:
raise JsonableError(_("Stream name '%s' is already taken") % (new_name,))
check_stream_name_available(user_profile.realm, new_name)
do_rename_stream(stream, new_name)
if is_private is not None:
do_change_stream_invite_only(stream, is_private)