under models moved contents of file q_and_a to --> question, answer and removed q_and_a

4 files changed, 96 insertions, 101 deletions

diff --git a/forum/models/__init__.py b/forum/models/__init__.py
index 71c2e902..2ab7b263 100755
--- a/forum/models/__init__.py
+++ b/forum/models/__init__.py
@@ -1,6 +1,5 @@
-from question import Question

-from answer import Answer

-from q_and_a import QuestionRevision, QuestionView, AnonymousAnswer, AnonymousQuestion, AnswerRevision, FavoriteQuestion

+from question import Question ,QuestionRevision, QuestionView, AnonymousQuestion, FavoriteQuestion

+from answer import Answer, AnonymousAnswer, AnswerRevision

 from tag import Tag, MarkedTag

 from meta import Vote, Comment, FlaggedItem

 from user import Activity, AnonymousEmail, EmailFeedSetting

diff --git a/forum/models/answer.py b/forum/models/answer.py
index 92a86085..4a44bd49 100755
--- a/forum/models/answer.py
+++ b/forum/models/answer.py
@@ -98,4 +98,37 @@ class Answer(Content, DeletableContent):
         return '%s%s#%s' % (reverse('question', args=[self.question.id]), django_urlquote(slugify(self.question.title)), self.id)

 

     def __unicode__(self):

-        return self.html
\ No newline at end of file
+        return self.html

+

+class AnswerRevision(ContentRevision):

+    """A revision of an Answer."""

+    answer     = models.ForeignKey('Answer', related_name='revisions')

+

+    def get_absolute_url(self):

+        return reverse('answer_revisions', kwargs={'id':self.answer.id})

+

+    def get_question_title(self):

+        return self.answer.question.title

+

+    class Meta(ContentRevision.Meta):

+        db_table = u'answer_revision'

+        ordering = ('-revision',)

+

+    def save(self, **kwargs):

+        """Looks up the next available revision number if not set."""

+        if not self.revision:

+            self.revision = AnswerRevision.objects.filter(

+                answer=self.answer).values_list('revision',

+                                                flat=True)[0] + 1

+        super(AnswerRevision, self).save(**kwargs)

+

+class AnonymousAnswer(AnonymousContent):

+    question = models.ForeignKey('Question', related_name='anonymous_answers')

+

+    def publish(self,user):

+        added_at = datetime.datetime.now()

+        #print user.id

+        AnswerManager.create_new(question=self.question,wiki=self.wiki,

+                            added_at=added_at,text=self.text,

+                            author=user)

+        self.delete()

diff --git a/forum/models/q_and_a.py b/forum/models/q_and_a.py
deleted file mode 100755
index 76266e80..00000000
--- a/forum/models/q_and_a.py
+++ /dev/null
@@ -1,97 +0,0 @@
-from base import *

-

-from question import Question, QuestionManager

-

-class QuestionView(models.Model):

-    question = models.ForeignKey(Question, related_name='viewed')

-    who = models.ForeignKey(User, related_name='question_views')

-    when = models.DateTimeField()

-

-    class Meta:

-        app_label = 'forum'

-

-class FavoriteQuestion(models.Model):

-    """A favorite Question of a User."""

-    question      = models.ForeignKey(Question)

-    user          = models.ForeignKey(User, related_name='user_favorite_questions')

-    added_at = models.DateTimeField(default=datetime.datetime.now)

-

-    class Meta:

-        app_label = 'forum'

-        db_table = u'favorite_question'

-    def __unicode__(self):

-        return '[%s] favorited at %s' %(self.user, self.added_at)

-

-class QuestionRevision(ContentRevision):

-    """A revision of a Question."""

-    question   = models.ForeignKey(Question, related_name='revisions')

-    title      = models.CharField(max_length=300)

-    tagnames   = models.CharField(max_length=125)

-

-    class Meta(ContentRevision.Meta):

-        db_table = u'question_revision'

-        ordering = ('-revision',)

-

-    def get_question_title(self):

-        return self.question.title

-

-    def get_absolute_url(self):

-        #print 'in QuestionRevision.get_absolute_url()'

-        return reverse('question_revisions', args=[self.question.id])

-

-    def save(self, **kwargs):

-        """Looks up the next available revision number."""

-        if not self.revision:

-            self.revision = QuestionRevision.objects.filter(

-                question=self.question).values_list('revision',

-                                                    flat=True)[0] + 1

-        super(QuestionRevision, self).save(**kwargs)

-

-    def __unicode__(self):

-        return u'revision %s of %s' % (self.revision, self.title)

-

-class AnonymousQuestion(AnonymousContent):

-    title = models.CharField(max_length=300)

-    tagnames = models.CharField(max_length=125)

-

-    def publish(self,user):

-        added_at = datetime.datetime.now()

-        QuestionManager.create_new(title=self.title, author=user, added_at=added_at,

-                                wiki=self.wiki, tagnames=self.tagnames,

-                                summary=self.summary, text=self.text)

-        self.delete()

-

-from answer import Answer, AnswerManager

-

-class AnswerRevision(ContentRevision):

-    """A revision of an Answer."""

-    answer     = models.ForeignKey('Answer', related_name='revisions')

-

-    def get_absolute_url(self):

-        return reverse('answer_revisions', kwargs={'id':self.answer.id})

-

-    def get_question_title(self):

-        return self.answer.question.title

-

-    class Meta(ContentRevision.Meta):

-        db_table = u'answer_revision'

-        ordering = ('-revision',)

-

-    def save(self, **kwargs):

-        """Looks up the next available revision number if not set."""

-        if not self.revision:

-            self.revision = AnswerRevision.objects.filter(

-                answer=self.answer).values_list('revision',

-                                                flat=True)[0] + 1

-        super(AnswerRevision, self).save(**kwargs)

-

-class AnonymousAnswer(AnonymousContent):

-    question = models.ForeignKey('Question', related_name='anonymous_answers')

-

-    def publish(self,user):

-        added_at = datetime.datetime.now()

-        #print user.id

-        AnswerManager.create_new(question=self.question,wiki=self.wiki,

-                            added_at=added_at,text=self.text,

-                            author=user)

-        self.delete()
\ No newline at end of file
diff --git a/forum/models/question.py b/forum/models/question.py
index 6db2bdc0..cfa2f6be 100755
--- a/forum/models/question.py
+++ b/forum/models/question.py
@@ -273,3 +273,63 @@ class Question(Content, DeletableContent):
 

     def __unicode__(self):

         return self.title

+class QuestionView(models.Model):

+    question = models.ForeignKey(Question, related_name='viewed')

+    who = models.ForeignKey(User, related_name='question_views')

+    when = models.DateTimeField()

+

+    class Meta:

+        app_label = 'forum'

+

+class FavoriteQuestion(models.Model):

+    """A favorite Question of a User."""

+    question      = models.ForeignKey(Question)

+    user          = models.ForeignKey(User, related_name='user_favorite_questions')

+    added_at = models.DateTimeField(default=datetime.datetime.now)

+

+    class Meta:

+        app_label = 'forum'

+        db_table = u'favorite_question'

+    def __unicode__(self):

+        return '[%s] favorited at %s' %(self.user, self.added_at)

+

+class QuestionRevision(ContentRevision):

+    """A revision of a Question."""

+    question   = models.ForeignKey(Question, related_name='revisions')

+    title      = models.CharField(max_length=300)

+    tagnames   = models.CharField(max_length=125)

+

+    class Meta(ContentRevision.Meta):

+        db_table = u'question_revision'

+        ordering = ('-revision',)

+

+    def get_question_title(self):

+        return self.question.title

+

+    def get_absolute_url(self):

+        #print 'in QuestionRevision.get_absolute_url()'

+        return reverse('question_revisions', args=[self.question.id])

+

+    def save(self, **kwargs):

+        """Looks up the next available revision number."""

+        if not self.revision:

+            self.revision = QuestionRevision.objects.filter(

+                question=self.question).values_list('revision',

+                                                    flat=True)[0] + 1

+        super(QuestionRevision, self).save(**kwargs)

+

+    def __unicode__(self):

+        return u'revision %s of %s' % (self.revision, self.title)

+

+class AnonymousQuestion(AnonymousContent):

+    title = models.CharField(max_length=300)

+    tagnames = models.CharField(max_length=125)

+

+    def publish(self,user):

+        added_at = datetime.datetime.now()

+        QuestionManager.create_new(title=self.title, author=user, added_at=added_at,

+                                wiki=self.wiki, tagnames=self.tagnames,

+                                summary=self.summary, text=self.text)

+        self.delete()

+

+from answer import Answer, AnswerManager