From ab1e9f2b97d8bf3d3bada409aeca375c4d87a119 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Sun, 29 Jan 2017 18:59:25 -0800 Subject: [PATCH] rename_stream: Move stripping of whitespace to view. --- zerver/lib/actions.py | 4 ++-- zerver/views/streams.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/zerver/lib/actions.py b/zerver/lib/actions.py index a059939e6d..b11ff7d55c 100644 --- a/zerver/lib/actions.py +++ b/zerver/lib/actions.py @@ -2059,8 +2059,8 @@ def do_change_stream_invite_only(stream, invite_only): def do_rename_stream(realm, old_name, new_name, log=True): # type: (Realm, Text, Text, bool) -> Dict[str, Text] - old_name = old_name.strip() - new_name = new_name.strip() + old_name = old_name + new_name = new_name stream = get_stream(old_name, realm) diff --git a/zerver/views/streams.py b/zerver/views/streams.py index 63658e68c2..575dc383f8 100644 --- a/zerver/views/streams.py +++ b/zerver/views/streams.py @@ -95,6 +95,7 @@ def update_stream_backend(request, user_profile, stream_id, if description is not None: do_change_stream_description(user_profile.realm, stream.name, description) if new_name is not None: + new_name = new_name.strip() do_rename_stream(user_profile.realm, stream.name, new_name) if is_private is not None: do_change_stream_invite_only(stream, is_private)