diff --git a/contentcuration/contentcuration/frontend/shared/composables/useLatestCommunityLibrarySubmission.js b/contentcuration/contentcuration/frontend/shared/composables/useLatestCommunityLibrarySubmission.js index 2b4afe9e30..4ef6db157e 100644 --- a/contentcuration/contentcuration/frontend/shared/composables/useLatestCommunityLibrarySubmission.js +++ b/contentcuration/contentcuration/frontend/shared/composables/useLatestCommunityLibrarySubmission.js @@ -6,7 +6,11 @@ export function useLatestCommunityLibrarySubmission({ channelId, admin = false } function fetchLatestSubmission() { // Submissions are ordered by most recent first in the backend - return Resource.fetchCollection({ channel: channelId, max_results: 1 }).then(response => { + return Resource.fetchCollection({ + channel: channelId, + max_results: 1, + ordering: '-date_created', + }).then(response => { if (response.results.length > 0) { return response.results[0]; } diff --git a/contentcuration/contentcuration/viewsets/community_library_submission.py b/contentcuration/contentcuration/viewsets/community_library_submission.py index 22c549cc8f..b0a891be58 100644 --- a/contentcuration/contentcuration/viewsets/community_library_submission.py +++ b/contentcuration/contentcuration/viewsets/community_library_submission.py @@ -29,6 +29,7 @@ from contentcuration.viewsets.base import RESTCreateModelMixin from contentcuration.viewsets.base import RESTDestroyModelMixin from contentcuration.viewsets.base import RESTUpdateModelMixin +from contentcuration.viewsets.base import ValuesViewsetOrderingFilter from contentcuration.viewsets.common import UserFilteredPrimaryKeyRelatedField from contentcuration.viewsets.sync.utils import ( generate_added_to_community_library_event, @@ -244,12 +245,15 @@ class CommunityLibrarySubmissionViewSetMixin: "resolved_by_name": get_resolved_by_name, "channel_name": lambda item: item.get("channel__name"), } - queryset = CommunityLibrarySubmission.objects.all().order_by("-date_updated") - filter_backends = [DjangoFilterBackend, SearchFilter] + queryset = CommunityLibrarySubmission.objects.all() + filter_backends = [DjangoFilterBackend, SearchFilter, ValuesViewsetOrderingFilter] filterset_class = CommunityLibrarySubmissionFilterSet search_fields = ["channel__name"] pagination_class = CommunityLibrarySubmissionPagination + ordering_fields = ["date_updated", "date_created"] + ordering = "-date_updated" + def consolidate(self, items, queryset): countries = {} for (submission_id, country_code,) in Country.objects.filter(