Merge pull request #364 from RSE-Sheffield/fix/survey-field-bug

Revert a change that broke things

Author: Joe-Heffer-Shef

home/models.py

@@ -131,11 +131,4 @@ def is_active(self) -> bool:
         """
         Does this project contain any active surveys?
         """
-        return any(self.surveys.values_list("is_active", flat=True))
-
-    @property
-    def survey_count(self) -> int:
-        """
-        How many surveys are organised within this project?
-        """
-        return self.surveys.count()
+        return any(self.survey.values_list("is_active", flat=True))

home/templates/organisation/organisation.html

@@ -48,7 +48,7 @@ <h2 class="text-2xl font-bold d-inline-block">Projects</h2>
                     <div class="card-body">
                         <p class="h5 card-title" title="Project identifier {{ project.pk }}">{{ project.name }}</p>
                         <p class="h6 card-subtitle text-muted mb-2">{{ project.description|default_if_none:"No description provided." }}</p>
-                        <p class="h7 card-text">Surveys: {{ project.survey_count }}</p>
+                        <p class="h7 card-text">Surveys: {{ project.survey.count }}</p>
 
                         <div class="mt-2 w-100 d-flex flex-wrap justify-content-end gap-2">
                             {% if can_edit|get_item:project.id %}

survey/models.py

@@ -33,7 +33,7 @@ class Survey(models.Model):
     survey_config = models.JSONField(null=True)
     consent_config = models.JSONField(null=True)
     demography_config = models.JSONField(null=True)
-    project = models.ForeignKey(Project, on_delete=models.CASCADE, null=True, related_name="surveys")
+    project = models.ForeignKey(Project, on_delete=models.CASCADE, null=True, related_name="survey")
     created_at = models.DateTimeField(auto_now_add=True)
     survey_body_path = models.TextField(blank=True, null=True)
     is_active = models.BooleanField(