Changeset 153:29e8f38274e2

Timestamp:

Oct 21, 2009 2:35:14 PM (4 years ago)

Author:

slav0nic <slav0nic0@…>

Branch:

default

Message:

fix topic removing

Location:

apps/forum

Files:

• models.py (modified) (1 diff)
• signals.py (modified) (2 diffs)

apps/forum/models.py

@@ -217 +217 @@
     def delete(self, *args, **kwargs):
         self_id = self.id
-        head_post_id = self.topic.posts.latest().id
+        head_post_id = self.topic.posts.order_by('created')[0].id
+        forum = self.topic.forum
+        topic = self.topic
         self.last_topic_post.clear()
         self.last_forum_post.clear()
         super(Post, self).delete(*args, **kwargs)
-
         #if post was last in topic - remove topic
         if self_id == head_post_id:
-            self.topic.delete()
+            topic.delete()
+        else:
+            try:
+                topic.last_post = Post.objects.filter(topic=topic).latest()
+            except Post.DoesNotExist:
+                topic.last_post = None
+            topic.post_count = Post.objects.filter(topic=topic).count()
+            topic.save()
+        try:
+            forum.last_post = Post.objects.filter(topic__forum=forum).latest()
+        except Post.DoesNotExist:
+            forum.last_post = None
+        forum.post_count = Post.objects.filter(topic__forum=forum).count()
+        forum.topic_count = Topic.objects.filter(forum=forum).count()
+        forum.save()
+
 
 

apps/forum/signals.py

@@ -23 +23 @@
 
 
-def post_deleted(instance, **kwargs):
-    post = instance
-    post.topic.post_count = Post.objects.filter(topic=post.topic).count()
-    post.topic.last_post = Post.objects.filter(topic=post.topic).latest()
-    post.topic.save()
-    post.topic.forum.post_count = Post.objects.filter(topic__forum=post.topic.forum).count()
-    post.topic.forum.last_post = Post.objects.filter(topic__forum=post.topic.forum).latest()
-    post.topic.forum.save()
-
-
 def pm_saved(instance, **kwargs):
     notify_pm_recipients(instance) 
@@ -48 +38 @@
 post_save.connect(pm_saved, sender=PrivateMessage)
 post_save.connect(topic_saved, sender=Topic)
-
-post_delete.connect(post_deleted, sender=Post)