Skip to content

Commit 177184d

Browse files
committed
Revert some changes meant for another PR
1 parent 047ed56 commit 177184d

File tree

1 file changed

+4
-23
lines changed

1 file changed

+4
-23
lines changed

learning_resources/views.py

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -593,17 +593,9 @@ class LearningResourceListRelationshipViewSet(viewsets.GenericViewSet):
593593

594594
permission_classes = (AnonymousAccessReadonlyPermission,)
595595
filter_backends = [MultipleOptionsFilterBackend]
596+
queryset = LearningResourceRelationship.objects.select_related("parent", "child")
596597
http_method_names = ["patch"]
597598

598-
def get_queryset(self):
599-
"""Return queryset with properly prefetched child learning resources"""
600-
return LearningResourceRelationship.objects.prefetch_related(
601-
Prefetch(
602-
"child",
603-
queryset=LearningResource.objects.for_serialization(),
604-
)
605-
)
606-
607599
def get_serializer_class(self):
608600
if self.action == "userlists":
609601
return UserListRelationshipSerializer
@@ -963,26 +955,15 @@ class UserListItemViewSet(NestedViewSetMixin, viewsets.ModelViewSet):
963955
Viewset for UserListRelationships
964956
"""
965957

966-
queryset = UserListRelationship.objects.order_by("position")
958+
queryset = UserListRelationship.objects.prefetch_related("child").order_by(
959+
"position"
960+
)
967961
serializer_class = UserListRelationshipSerializer
968962
pagination_class = DefaultPagination
969963
permission_classes = (HasUserListItemPermissions,)
970964
http_method_names = VALID_HTTP_METHODS
971965
parent_lookup_kwargs = {"userlist_id": "parent"}
972966

973-
def get_queryset(self):
974-
"""Return queryset with properly prefetched child learning resources"""
975-
user = self.request.user if hasattr(self, "request") else None
976-
# Start with the base queryset which gets filtered by NestedViewSetMixin
977-
qs = super().get_queryset()
978-
# Add prefetch for child learning resources
979-
return qs.prefetch_related(
980-
Prefetch(
981-
"child",
982-
queryset=LearningResource.objects.for_serialization(user=user),
983-
)
984-
)
985-
986967
def create(self, request, *args, **kwargs):
987968
user_list_id = kwargs.get("userlist_id")
988969
request.data["parent"] = user_list_id

0 commit comments

Comments
 (0)