Merge pull request #11 from udacity/make_faq_settings_translatable

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

diff --git a/forum/models/question.py b/forum/models/question.py
index a185e026bd623d56e0edb4d392ab9f2af95571db..5a7786de19092a3abed5a0d018a7f4c3053f198e 100644 (file)
--- a/forum/models/question.py
+++ b/forum/models/question.py
@@ -2,10 +2,8 @@ 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):
 class QuestionManager(NodeManager):

-    def search(self, keywords):
+    def search(self, keywords, **kwargs):

         return False, self.filter(models.Q(title__icontains=keywords) | models.Q(body__icontains=keywords))
 
 class Question(Node):
         return False, self.filter(models.Q(title__icontains=keywords) | models.Q(body__icontains=keywords))
 
 class Question(Node):


@@ -29,6 +27,9 @@ class Question(Node):
 
     @property
     def headline(self):
 
     @property
     def headline(self):

+        return self._headline()
+
+    def _headline(self):

         if self.nis.deleted:
             return _('[deleted] ') + self.title
 
         if self.nis.deleted:
             return _('[deleted] ') + self.title
 


@@ -61,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]
             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)
 
 class QuestionSubscription(models.Model):
     user = models.ForeignKey(User)