merge hernani > trunk

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

diff --git a/forum/models/question.py b/forum/models/question.py
index 2cb362cf8deee6b777387396a6510ceeeb3b56c1..ef4a37d814390a25f4de23734991570947db755c 100644 (file)
--- a/forum/models/question.py
+++ b/forum/models/question.py
@@ -2,8 +2,6 @@ from base import *
 from tag import Tag
 from django.utils.translation import ugettext as _
 
 from tag import Tag
 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 QuestionManager(NodeManager):
     def search(self, keywords):
         return False, self.filter(models.Q(title__icontains=keywords) | models.Q(body__icontains=keywords))


@@ -13,6 +11,7 @@ class Question(Node):
         proxy = True
 
     answer_count = DenormalizedField("children", ~models.Q(state_string__contains="(deleted)"), node_type="answer")
         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")
     favorite_count = DenormalizedField("actions", action_type="favorite", canceled=False)
 
     friendly_name = _("question")


@@ -37,16 +36,15 @@ class Question(Node):
         return self.title
 
     @property
         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))})
 
     @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])
 
     def get_revision_url(self):
         return reverse('question_revisions', args=[self.id])


@@ -61,13 +59,22 @@ class Question(Node):
             cache.set(cache_key, related_list, 60 * 60)
 
         return [Question.objects.get(id=r['id']) for r in related_list]
             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)
+    
+    def get_active_users(self):
+        active_users = set()
+        
+        active_users.add(self.author)
+        
+        for answer in self.answers:
+            active_users.add(answer.author)
+            
+            for comment in answer.comments:
+                active_users.add(comment.author)
+                        
+        for comment in self.comments:
+            active_users.add(comment.author)
+        
+        return active_users

 
 
 class QuestionSubscription(models.Model):
 
 
 class QuestionSubscription(models.Model):