X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/13bee2f2e6aea2d936909861f3ab60bb09821a60..ec62bc84aa89b5e946104bc4dcdf78f382c90165:/forum/models/question.py diff --git a/forum/models/question.py b/forum/models/question.py index bef5bb5..5a7786d 100644 --- 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 _ -question_view = django.dispatch.Signal(providing_args=['instance', 'user']) - 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): @@ -29,6 +27,9 @@ class Question(Node): @property def headline(self): + return self._headline() + + def _headline(self): if self.nis.deleted: return _('[deleted] ') + self.title @@ -62,27 +63,7 @@ class Question(Node): return [Question.objects.get(id=r['id']) for r in related_list] - 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 - -def question_viewed(instance, **kwargs): - instance.extra_count += 1 - instance.save() -question_view.connect(question_viewed) class QuestionSubscription(models.Model):