diff options
author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-03-10 17:28:10 -0300 |
---|---|---|
committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-03-10 17:28:10 -0300 |
commit | c1b3ed63996fca8b17036632008db628616e4498 (patch) | |
tree | 36b318c6cbe8da9391ea40493eb2d8b03c959ffe /askbot | |
parent | 62548d699fb81aa972a0ccca429978ecbd160bff (diff) | |
parent | ae150720e1a9d700a8a5541e6445c127d61662eb (diff) | |
download | askbot-c1b3ed63996fca8b17036632008db628616e4498.tar.gz askbot-c1b3ed63996fca8b17036632008db628616e4498.tar.bz2 askbot-c1b3ed63996fca8b17036632008db628616e4498.zip |
Merge branch 'github-master'
Diffstat (limited to 'askbot')
-rw-r--r-- | askbot/management/commands/delete_contextless_activities.py | 9 | ||||
-rw-r--r-- | askbot/models/__init__.py | 2 | ||||
-rw-r--r-- | askbot/models/question.py | 1 |
3 files changed, 10 insertions, 2 deletions
diff --git a/askbot/management/commands/delete_contextless_activities.py b/askbot/management/commands/delete_contextless_activities.py index e16a9957..553217bf 100644 --- a/askbot/management/commands/delete_contextless_activities.py +++ b/askbot/management/commands/delete_contextless_activities.py @@ -9,9 +9,14 @@ class Command(NoArgsCommand): deleted_count = 0 message = "Searching for context-less activity objects:" for act in ProgressBar(acts.iterator(), acts.count(), message): - if act.object_id != None and act.content_object == None: + try: + if act.object_id != None and act.content_object == None: + act.delete() + deleted_count += 1 + except: + #this can happen if we have a stale content type act.delete() - deleted_count += 1 + if deleted_count: print "%d activity objects deleted" % deleted_count else: diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py index d7f2770f..9abb4198 100644 --- a/askbot/models/__init__.py +++ b/askbot/models/__init__.py @@ -1104,6 +1104,7 @@ def user_retag_question( tagnames = tags, silent = silent ) + question.thread.invalidate_cached_data() award_badges_signal.send(None, event = 'retag_question', actor = self, @@ -1475,6 +1476,7 @@ def user_post_answer( email_notify = follow, wiki = wiki ) + answer_post.thread.invalidate_cached_data() award_badges_signal.send(None, event = 'post_answer', actor = self, diff --git a/askbot/models/question.py b/askbot/models/question.py index f0e6e03e..ff39bb7d 100644 --- a/askbot/models/question.py +++ b/askbot/models/question.py @@ -370,6 +370,7 @@ class Thread(models.Model): self.closed_at = closed_at self.close_reason = close_reason self.save() + self.invalidate_cached_data() def set_accepted_answer(self, answer, timestamp): if answer and answer.thread != self: |