fix another regression from #732

hawc/apps/mgmt/api.py

@@ -26,18 +26,18 @@ def get_queryset(self):
     @action(detail=False, permission_classes=(permissions.IsAuthenticated,))
     def assignments(self, request):
         # Tasks assigned to user.
-        qs = self.model.objects.owned_by(request.user).select_related(
+        qs = self.model.objects.select_related(
             "owner", "study", "study__reference_ptr", "study__assessment"
-        )
+        ).owned_by(request.user)
         serializer = serializers.TaskByAssessmentSerializer(qs, many=True)
         return Response(serializer.data)
 
     @action(detail=False, action_perms=AssessmentViewSetPermissions.CAN_VIEW_OBJECT)
     def assessment_assignments(self, request):
         # Tasks assigned to user for a specific assessment
         qs = (
-            self.model.objects.owned_by(request.user)
-            .filter(study__assessment=self.assessment)
+            self.model.objects.filter(study__assessment=self.assessment)
+            .owned_by(request.user)
             .select_related("owner", "study", "study__reference_ptr", "study__assessment")
         )
         serializer = serializers.TaskByAssessmentSerializer(qs, many=True)

hawc/apps/mgmt/managers.py

@@ -1,17 +1,24 @@
 import logging
 
+from django.db.models import QuerySet
+
 from ..common.models import BaseManager
 from ..study.models import Study
 from . import constants
 
 logger = logging.getLogger(__name__)
 
 
+class TaskQuerySet(QuerySet):
+    def owned_by(self, user):
+        return self.filter(owner=user)
+
+
 class TaskManager(BaseManager):
     assessment_relation = "study__assessment"
 
-    def owned_by(self, user):
-        return self.filter(owner=user)
+    def get_queryset(self):
+        return TaskQuerySet(self.model, using=self._db)
 
     def create_assessment_tasks(self, assessment):
         """

hawc/apps/mgmt/views.py

@@ -92,7 +92,7 @@ class UserAssignments(RobTaskMixin, WebappMixin, LoginRequiredMixin, ListView):
     template_name = "mgmt/user_assignments.html"
 
     def get_queryset(self):
-        return self.model.objects.owned_by(self.request.user)
+        return self.model.objects.all().owned_by(self.request.user)
 
     def get_rob_queryset(self, RiskOfBias):
         return RiskOfBias.objects.filter(author=self.request.user, active=True)
@@ -112,8 +112,8 @@ def get_queryset(self):
         return (
             super()
             .get_queryset()
-            .owned_by(self.request.user)
             .filter(study__assessment=self.assessment)
+            .owned_by(self.request.user)
             .select_related("owner", "study", "study__reference_ptr", "study__assessment")
         )