X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/293ecbd0f64bcdf5e89ab05c7000a8cea772e1f6..dfcd16216da92b7011fad163462034e37f3c6996:/forum/models/question.py

diff --git a/forum/models/question.py b/forum/models/question.py
index 1cc0884..010647c 100644
--- a/forum/models/question.py
+++ b/forum/models/question.py
@@ -1,20 +1,19 @@
 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))
+        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", ~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")
@@ -39,16 +38,15 @@ class Question(Node):
         return self.title
 
     @property
-    def answer_accepted(self):
-        return self.extra_ref is not None
-
-    @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):
         return ('question', (), {'id': self.id, 'slug': django_urlquote(slugify(self.title))})
+        
+    def meta_description(self):
+        return self.summary
 
     def get_revision_url(self):
         return reverse('question_revisions', args=[self.id])
@@ -63,6 +61,29 @@ class Question(Node):
             cache.set(cache_key, related_list, 60 * 60)
 
         return [Question.objects.get(id=r['id']) for r in related_list]
+    
+    def get_active_users(self):
+        active_users = []
+        
+        active_users.append(self.author)
+        
+        for answer in self.answers:
+            active_users.append(answer.author)
+        
+        for child in self.children.all():
+            active_users.append(child.author)
+            for grandchild in child.children.all():
+                active_users.append(grandchild.author)
+        
+        # Remove duplicates
+        unique_active_users = []
+        for user in active_users:
+            if user not in unique_active_users:
+                unique_active_users.append(user)
+        active_users = unique_active_users
+        del unique_active_users
+        
+        return active_users
 
 
 def question_viewed(instance, **kwargs):