Fix prefetching

rdmorganiser · Mar 28, 2023 · fb624d6 · fb624d6
1 parent 3fb103e
commit fb624d6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/rdmo/conditions/viewsets.py b/rdmo/conditions/viewsets.py
@@ -19,7 +19,7 @@
 class ConditionViewSet(CopyModelMixin, ModelViewSet):
     permission_classes = (HasModelPermission, )
     queryset = Condition.objects.select_related('source', 'target_option') \
-                                .prefetch_related('optionsets', 'questionsets', 'questions', 'tasks')
+                                .prefetch_related('optionsets', 'pages', 'questionsets', 'questions', 'tasks')
 
     filter_backends = (DjangoFilterBackend,)
     filterset_fields = (

diff --git a/rdmo/options/viewsets.py b/rdmo/options/viewsets.py
@@ -68,7 +68,7 @@ class OptionViewSet(CopyModelMixin, ModelViewSet):
     permission_classes = (HasModelPermission, )
     queryset = Option.objects.annotate(values_count=models.Count('values')) \
                              .annotate(projects_count=models.Count('values__project', distinct=True)) \
-                             .prefetch_related('option_optionsets__optionset')
+                             .prefetch_related('optionsets', 'conditions')
     serializer_class = OptionSerializer
 
     filter_backends = (DjangoFilterBackend,)