scratchfoundation/s2forums
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid moving the spam topic to the main dustbin.

Browse source 
If the only post gets marked as ham, the topic it belonged to would be deleted.
This commit is contained in:
Ray Schamp 2014-03-18 13:41:47 -04:00
parent 1d93a7b59f
commit 03cb7b86e0
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
djangobb_forum/models.py
View file

@ -286,8 +286,8 @@ class Post(models.Model):
self.body_html = smiles(self.body_html)
super(Post, self).save(*args, **kwargs)
def move_to(self, to_topic):
delete_topic = (self.topic.posts.count() == 1)
def move_to(self, to_topic, delete_topic=True):
delete_topic = (self.topic.posts.count() == 1 && delete_topic)
prev_topic = self.topic
self.topic = to_topic
self.save()
@ -631,9 +631,14 @@ class PostStatus(models.Model):
head = post.topic.head
if post == head:
# Move the original topic back to the original forum (either from
# the dustbin, or from the spam dustbin)
topic.move_to(self.forum)
else:
post.move_to(self.topic)
if topic != post.topic:
# If the post was moved from its original topic, put it back now that
# the topic is in place.
post.move_to(topic, delete_topic=False)
def _delete_post(self):
"""