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

diff --git a/forum/models/question.py b/forum/models/question.py
index 1cc0884..5a7786d 100644
--- a/forum/models/question.py
+++ b/forum/models/question.py
@@ -1,20 +1,17 @@
 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))
+    def search(self, keywords, **kwargs):
+        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")
@@ -30,6 +27,9 @@ class Question(Node):
 
     @property
     def headline(self):
+        return self._headline()
+
+    def _headline(self):
         if self.nis.deleted:
             return _('[deleted] ') + self.title
 
@@ -39,16 +39,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,14 +62,9 @@ class Question(Node):
             cache.set(cache_key, related_list, 60 * 60)
 
         return [Question.objects.get(id=r['id']) for r in related_list]
+    
 
 
-def question_viewed(instance, **kwargs):
-    instance.extra_count += 1
-    instance.save()
-
-question_view.connect(question_viewed)
-
 
 class QuestionSubscription(models.Model):
     user = models.ForeignKey(User)