OSQA-748, smart unicode filtration for the username in the accept rate singular title

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

diff --git a/forum/models/answer.py b/forum/models/answer.py
index bac79af3894863d5e7dc0cd3cf6b9bc0c7c6258d..04735a4cc537c3bf81aacac7318749fb4d71e2c7 100644 (file)
--- a/forum/models/answer.py
+++ b/forum/models/answer.py
@@ -1,75 +1,23 @@
 from base import *
+from django.utils.translation import ugettext as _
 
-from question import Question
+class Answer(Node):
+    friendly_name = _("answer")
 
-class Answer(QandA):
-    accepted    = models.BooleanField(default=False)
-    accepted_at = models.DateTimeField(null=True, blank=True)
-    accepted_by = models.ForeignKey(User, null=True)
+    class Meta(Node.Meta):
+        proxy = True
 
-    class Meta(QandA.Meta):
-        db_table = u'answer'
+    @property
+    def accepted(self):
+        return self.nis.accepted
 
     @property
     def headline(self):
         return self.question.headline
 
-    def mark_accepted(self, user):
-        if not self.accepted and not self.question.answer_accepted:
-            self.accepted = True
-            self.accepted_at = datetime.datetime.now()
-            self.accepted_by = user
-            self.save()
-            self.question.answer_accepted = True
-            self.question.save()
-            return True
-
-        return False
-
-    def unmark_accepted(self):
-        if self.accepted:
-            self.accepted = False
-            self.save()
-            self.question.answer_accepted = False
-            self.question.save()
-            return True
-
-        return False
-
-    def _update_question_answer_count(self, diff):
-        self.question.answer_count = self.question.answer_count + diff
-        self.question.save()
-
-    def activate_revision(self, user, revision):
-        super(Answer, self).activate_revision(user, revision)
-        self.question.update_last_activity(user)
-
-    def mark_deleted(self, user):
-        if super(Answer, self).mark_deleted(user):
-            self._update_question_answer_count(-1)
-
-    def unmark_deleted(self):
-        if super(Answer, self).unmark_deleted():
-            self._update_question_answer_count(1)
-
-    def get_latest_revision(self):
-        return self.revisions.all()[0]
-
-    def get_question_title(self):
-        return self.question.title
-
     def get_absolute_url(self):
-        return '%s#%s' % (self.question.get_absolute_url(), self.id)
-
-    def save(self, *args, **kwargs):
-        super(Answer, self).save(*args, **kwargs)
-
-        if self._is_new:
-            self._update_question_answer_count(1)
+        return '%s/%s' % (self.question.get_absolute_url(), self.id)
 
-    def __unicode__(self):
-        return self.html
-        
 
 class AnswerRevision(NodeRevision):
     class Meta: