Fixes

tabbycat/adjfeedback/models.py

@@ -38,7 +38,7 @@ class Meta:
         constraints = [UniqueConstraint(fields=['question', 'feedback'])]
 
 
-class BooleanAnswerMixin:
+class BooleanAnswer(models.Model):
     ANSWER_TYPE = bool
 
     # Note: by convention, if no answer is chosen for a boolean answer, an
@@ -47,55 +47,64 @@ class BooleanAnswerMixin:
     answer = models.BooleanField(verbose_name=_("answer"))
 
 
-class IntegerAnswerMixin:
+class IntegerAnswer(models.Model):
     ANSWER_TYPE = int
     answer = models.IntegerField(verbose_name=_("answer"))
 
+    class Meta:
+        abstract = True
+
 
-class FloatAnswerMixin:
+class FloatAnswer(models.Model):
     ANSWER_TYPE = float
     answer = models.FloatField(verbose_name=_("answer"))
 
+    class Meta:
+        abstract = True
 
-class StringAnswerMixin:
+
+class StringAnswer(models.Model):
     ANSWER_TYPE = str
     answer = models.TextField(verbose_name=_("answer"))
 
+    class Meta:
+        abstract = True
+
 
-class ArrayAnswerMixin:
+class ArrayAnswer(models.Model):
     ANSWER_TYPE = list
     answer = ArrayField(base_field=models.TextField(), verbose_name=_("answer"))
 
 
-class AdjudicatorFeedbackBooleanAnswer(BooleanAnswerMixin, AdjudicatorFeedbackAnswer):
+class AdjudicatorFeedbackBooleanAnswer(BooleanAnswer, AdjudicatorFeedbackAnswer):
 
     class Meta(AdjudicatorFeedbackAnswer.Meta):
         verbose_name = _("adjudicator feedback boolean answer")
         verbose_name_plural = _("adjudicator feedback boolean answers")
 
 
-class AdjudicatorFeedbackIntegerAnswer(IntegerAnswerMixin, AdjudicatorFeedbackAnswer):
+class AdjudicatorFeedbackIntegerAnswer(IntegerAnswer, AdjudicatorFeedbackAnswer):
 
     class Meta(AdjudicatorFeedbackAnswer.Meta):
         verbose_name = _("adjudicator feedback integer answer")
         verbose_name_plural = _("adjudicator feedback integer answers")
 
 
-class AdjudicatorFeedbackFloatAnswer(FloatAnswerMixin, AdjudicatorFeedbackAnswer):
+class AdjudicatorFeedbackFloatAnswer(FloatAnswer, AdjudicatorFeedbackAnswer):
 
     class Meta(AdjudicatorFeedbackAnswer.Meta):
         verbose_name = _("adjudicator feedback float answer")
         verbose_name_plural = _("adjudicator feedback float answers")
 
 
-class AdjudicatorFeedbackStringAnswer(StringAnswerMixin, AdjudicatorFeedbackAnswer):
+class AdjudicatorFeedbackStringAnswer(StringAnswer, AdjudicatorFeedbackAnswer):
 
     class Meta(AdjudicatorFeedbackAnswer.Meta):
         verbose_name = _("adjudicator feedback string answer")
         verbose_name_plural = _("adjudicator feedback string answers")
 
 
-class AdjudicatorFeedbackManyAnswer(ArrayAnswerMixin, AdjudicatorFeedbackAnswer):
+class AdjudicatorFeedbackManyAnswer(ArrayAnswer, AdjudicatorFeedbackAnswer):
 
     class Meta(AdjudicatorFeedbackAnswer.Meta):
         verbose_name = _("adjudicator feedback multiple select answer")