X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/bdb70243eb9189c92189c05afad9599ab1453946..f3fa23854f0192e9bcf5bf6ee2bd731f2f003900:/forum/models/question.py?ds=sidebyside diff --git a/forum/models/question.py b/forum/models/question.py index 010647c..6fae319 100644 --- 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 _ -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)) @@ -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,35 +63,7 @@ class Question(Node): 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): - instance.extra_count += 1 - instance.save() -question_view.connect(question_viewed) class QuestionSubscription(models.Model):