From ccdf17f47e694f18cf9fbb46505160c14ca4c8ed Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Sun, 29 Jan 2017 19:03:32 -0800 Subject: [PATCH] rename_stream: Move stream already has name check to view. --- zerver/lib/actions.py | 2 +- zerver/views/streams.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/zerver/lib/actions.py b/zerver/lib/actions.py index 289e13feb2..ce7cb62688 100644 --- a/zerver/lib/actions.py +++ b/zerver/lib/actions.py @@ -2067,7 +2067,7 @@ def do_rename_stream(realm, old_name, new_name, log=True): if not stream: raise JsonableError(_('Unknown stream "%s"') % (old_name,)) - if get_stream(new_name, realm) and old_name.lower() != new_name.lower(): + if get_stream(new_name, realm) is not None: raise JsonableError(_('Stream name "%s" is already taken') % (new_name,)) old_name = stream.name diff --git a/zerver/views/streams.py b/zerver/views/streams.py index 78f975d801..a5b8b9e01a 100644 --- a/zerver/views/streams.py +++ b/zerver/views/streams.py @@ -98,7 +98,8 @@ def update_stream_backend(request, user_profile, stream_id, 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!")) do_rename_stream(user_profile.realm, stream.name, new_name) if is_private is not None: do_change_stream_invite_only(stream, is_private)