From 566579e78e36ed9d84f74837165e0f1dcc8edf36 Mon Sep 17 00:00:00 2001 From: Ross Date: Fri, 5 Feb 2021 12:43:03 +0000 Subject: [PATCH] . --- longs/models.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/longs/models.py b/longs/models.py index eb568a6c..e61b9756 100644 --- a/longs/models.py +++ b/longs/models.py @@ -94,7 +94,7 @@ class Long(models.Model): return authors def __str__(self): - examinations = [series.examination for series in self.series.all()] + examinations = [series.get_examination() for series in self.series.all()] return "{} : {}".format(self.history, ", ".join(examinations)) def GetExams(self): @@ -131,10 +131,12 @@ class LongSeries(models.Model): long = models.ForeignKey("Long", help_text="The question this series should be associated with", related_name="series", on_delete=models.SET_NULL, null=True) description = models.TextField(blank=True, help_text="Description of stack, for admin organisation, will not be visible when taking") - #def get_examinations(self): - # """Returns a comma seperated text list of regions""" - # examinations = ", ".join([i.examination for i in self.examination.all()]) - # return examinations + def __str__(self): + return "{} : {}".format(self.get_examination(), self.description) + + def get_examination(self): + """Returns a comma seperated text list of regions""" + return str(self.examinations) def get_absolute_url(self): return reverse('longs:long_series_detail', kwargs={'pk': self.pk})