CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-06-24 21:08:25 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

update_messages_for_topic_edit: Remame message variable.

Browse Source
This commit is contained in:
Aman Agrawal 2021-04-22 05:00:27 +00:00 committed by Tim Abbott
parent 0ab3e15d71
commit 736fdcda49
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zerver/lib/actions.py
View File

@ -5564,7 +5564,7 @@ def do_update_message(
if propagate_mode in ["change_later", "change_all"]:
assert topic_name is not None or new_stream is not None
messages_list = update_messages_for_topic_edit(
message=message,
edited_message=message,
propagate_mode=propagate_mode,
orig_topic_name=orig_topic_name,
topic_name=topic_name,

8
zerver/lib/topic.py
View File

@ -127,7 +127,7 @@ def user_message_exists_for_topic(
def update_messages_for_topic_edit(
message: Message,
edited_message: Message,
propagate_mode: str,
orig_topic_name: str,
topic_name: Optional[str],
@ -141,13 +141,13 @@ def update_messages_for_topic_edit(
if old_recipient_id is not None:
recipient_id = old_recipient_id
else:
recipient_id = message.recipient_id
recipient_id = edited_message.recipient_id
propagate_query = Q(recipient_id=recipient_id, subject__iexact=orig_topic_name)
if propagate_mode == "change_all":
propagate_query = propagate_query & ~Q(id=message.id)
propagate_query = propagate_query & ~Q(id=edited_message.id)
if propagate_mode == "change_later":
propagate_query = propagate_query & Q(id__gt=message.id)
propagate_query = propagate_query & Q(id__gt=edited_message.id)
messages = Message.objects.filter(propagate_query).select_related()