Fixes OSQA 413, 414, 415, 416, 417 (patches from mathieu Lafon) and 420 /patch by...

[osqa.git] / forum / models / question.py

diff --git a/forum/models/question.py b/forum/models/question.py
index 54840166d1d9c51534de77884296f670622bb0cf..55f37c47ca787ec207b992622141463983d23884 100644 (file)
--- a/forum/models/question.py
+++ b/forum/models/question.py
@@ -4,18 +4,24 @@ from django.utils.translation import ugettext as _
 
 question_view = django.dispatch.Signal(providing_args=['instance', 'user'])
 
+class QuestionManager(NodeManager):
+    def search(self, keywords):
+        return False, self.filter(models.Q(title__icontains=keywords) | models.Q(body__icontains=keywords))
+
 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")
+    accepted_count = DenormalizedField("children", ~models.Q(state_string__contains="(deleted)"), node_type="answer", marked=True)
     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):
@@ -23,21 +29,17 @@ 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
 
-        return self.title
+        if self.nis.closed:
+            return _('[closed] ') + self.title
 
-    @property
-    def answer_accepted(self):
-        return self.extra_ref is not None
+        return self.title
 
     @property
-    def accepted_answer(self):
-        return self.extra_ref
+    def accepted_answers(self):
+        return self.answers.filter(~models.Q(state_string__contains="(deleted)"), marked=True)
 
     @models.permalink    
     def get_absolute_url(self):
@@ -51,8 +53,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]