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

Change the way referred attachments are removed on message update. 

This fixes incorrect behavior when two or more attachments are removed
in the same message.
This commit is contained in:
rahuldeve 2016-07-25 01:33:22 +05:30 committed by Tim Abbott
parent 65175ef15a
commit 4267dcbb68
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zerver/lib/actions.py
View File

@ -3344,14 +3344,7 @@ def check_attachment_reference_change(prev_content, message):
path_ids.append(path_id) path_ids.append(path_id)
attachments_to_update = Attachment.objects.filter(path_id__in=path_ids).select_for_update() attachments_to_update = Attachment.objects.filter(path_id__in=path_ids).select_for_update()
for attachment in attachments_to_update: message.attachment_set.remove(*attachments_to_update)
try:
attachment = Attachment.objects.get(path_id=path_id)
attachment.messages.remove(message)
attachment.save()
except Attachment.DoesNotExist:
# The entry for this attachment does not exist. Just ignore.
pass
to_add = list(new_attachments - prev_attachments) to_add = list(new_attachments - prev_attachments)
if len(to_add) > 0: if len(to_add) > 0: