From 32417b1b1d4fad5f7c9ec92748f15c11b6ac1457 Mon Sep 17 00:00:00 2001 From: Morgan Aubert Date: Mon, 18 May 2020 12:30:45 -0400 Subject: [PATCH] Fix possible inconsistency when moving topics through moderation --- machina/apps/forum_moderation/views.py | 2 -- tests/functional/apps/forum_moderation/test_views.py | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/machina/apps/forum_moderation/views.py b/machina/apps/forum_moderation/views.py index 5c49901d7..fb127b4ce 100644 --- a/machina/apps/forum_moderation/views.py +++ b/machina/apps/forum_moderation/views.py @@ -202,7 +202,6 @@ def form_valid(self, form): """ Handles a valid form. """ # Move the topic topic = self.object - old_forum = topic.forum new_forum = form.cleaned_data['forum'] topic.forum = new_forum @@ -213,7 +212,6 @@ def form_valid(self, form): topic.status = Topic.TOPIC_MOVED topic.save() - old_forum.save() messages.success(self.request, self.success_message) return HttpResponseRedirect(self.get_success_url()) diff --git a/tests/functional/apps/forum_moderation/test_views.py b/tests/functional/apps/forum_moderation/test_views.py index 5939c5f08..ca3ac144f 100644 --- a/tests/functional/apps/forum_moderation/test_views.py +++ b/tests/functional/apps/forum_moderation/test_views.py @@ -255,6 +255,7 @@ def setup(self): self.other_forum = create_forum() # Set up a topic and some posts + self.previous_topic = create_topic(forum=self.top_level_forum, poster=self.user) self.topic = create_topic(forum=self.top_level_forum, poster=self.user) self.first_post = PostFactory.create(topic=self.topic, poster=self.user) self.post = PostFactory.create(topic=self.topic, poster=self.user) @@ -293,6 +294,8 @@ def test_can_move_topics(self): # Check self.topic.refresh_from_db() assert self.topic.forum == self.other_forum + self.top_level_forum.refresh_from_db() + assert self.top_level_forum.last_post == self.previous_topic.last_post def test_can_move_and_lock_topics(self): # Setup