X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/80e81e8ba3e132d6b51a0bb4c794d8f2c1f600d9..720f7b0224eebb2c6ab92c5bf83fbddbf82720b3:/forum/models/question.py

diff --git a/forum/models/question.py b/forum/models/question.py
index 9e8dcf6..7902a50 100644
--- a/forum/models/question.py
+++ b/forum/models/question.py
@@ -1,12 +1,10 @@
 from base import *
 from tag import Tag
 from django.utils.translation import ugettext as _
-from forum.modules.decorators import decoratable
 
 question_view = django.dispatch.Signal(providing_args=['instance', 'user'])
 
 class QuestionManager(NodeManager):
-    @decoratable.method
     def search(self, keywords):
         return self.filter(models.Q(title__icontains=keywords) | models.Q(body__icontains=keywords))
 
@@ -14,15 +12,15 @@ class Question(Node):
     class Meta(Node.Meta):
         proxy = True
 
-    answer_count = DenormalizedField("children", node_type="answer", deleted=None)
+    answer_count = DenormalizedField("children", ~models.Q(state_string__contains="(deleted)"), node_type="answer")
     favorite_count = DenormalizedField("actions", action_type="favorite", canceled=False)
 
     friendly_name = _("question")
     objects = QuestionManager()
 
-    @property   
+    @property
     def closed(self):
-        return self.extra_action
+        return self.nis.closed
 
     @property    
     def view_count(self):
@@ -30,12 +28,12 @@ class Question(Node):
 
     @property
     def headline(self):
-        if self.marked:
-            return _('[closed] ') + self.title
-
-        if self.deleted:
+        if self.nis.deleted:
             return _('[deleted] ') + self.title
 
+        if self.nis.closed:
+            return _('[closed] ') + self.title
+
         return self.title
 
     @property
@@ -58,8 +56,8 @@ class Question(Node):
         related_list = cache.get(cache_key)
 
         if related_list is None:
-            related_list = Question.objects.values('id').filter(tags__id__in=[t.id for t in self.tags.all()]
-            ).exclude(id=self.id).filter(deleted=None).annotate(frequency=models.Count('id')).order_by('-frequency')[:count]
+            related_list = Question.objects.filter_state(deleted=False).values('id').filter(tags__id__in=[t.id for t in self.tags.all()]
+            ).exclude(id=self.id).annotate(frequency=models.Count('id')).order_by('-frequency')[:count]
             cache.set(cache_key, related_list, 60 * 60)
 
         return [Question.objects.get(id=r['id']) for r in related_list]