Delete replies properly when deleting a thread. Delete thread directly, not by

deleting its OP

boards/models/post.py

@@ -355,8 +355,7 b' class Post(models.Model, Viewable):'
 
     def delete(self, using=None):
         """
-        Deletes all post images and the post itself. If the post is opening,
-        thread with all posts is deleted.
+        Deletes all post images and the post itself.
         """
 
         for image in self.images.all():
@@ -364,9 +363,6 b' class Post(models.Model, Viewable):'
             if image_refs_count == 1:
                 image.delete()
 
-        if self.is_opening():
-            self.get_thread().delete()
-        else:
             thread = self.get_thread()
             thread.last_edit_time = timezone.now()
             thread.save()

boards/models/thread.py

@@ -127,6 +127,10 b' class Thread(models.Model):'
         return query.all()
 
     def get_replies_with_images(self, view_fields_only=False):
+        """
+        Gets replies that have at least one image attached
+        """
+
         return self.get_replies(view_fields_only).annotate(images_count=Count(
             'images')).filter(images_count__gt=0)
 
@@ -173,10 +177,14 b' class Thread(models.Model):'
         return self.get_opening_post().pub_time
 
     def delete(self, using=None):
-        if self.replies.exists():
-            self.replies.all().delete()
+        """
+        Deletes thread with all replies.
+        """
+
+        for reply in self.replies.all():
+            reply.delete()
 
         super(Thread, self).delete(using)
 
     def __str__(self):
-        return 'T#{}/{}'.format(self.id, self.get_opening_post_id())
  No newline at end of file
+        return 'T#{}/{}'.format(self.id, self.get_opening_post_id())

boards/tests/test_post.py

@@ -37,7 +37,7 b' class PostTests(TestCase):'
         thread = opening_post.get_thread()
         reply = Post.objects.create_post("", "", thread=thread)
 
-        opening_post.delete()
+        thread.delete()
 
         self.assertFalse(Post.objects.filter(id=reply.id).exists(),
                          'Reply was not deleted with the thread.')