Skip to content

Commit e70b1f9

Browse files
authored
Merge pull request #5773 from AlexVelezLl/fix-community-library-submissions-ordering
Fix duplicate community library submission
2 parents b515a2e + d24fbd2 commit e70b1f9

2 files changed

Lines changed: 11 additions & 3 deletions

File tree

contentcuration/contentcuration/frontend/shared/composables/useLatestCommunityLibrarySubmission.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ export function useLatestCommunityLibrarySubmission({ channelId, admin = false }
66

77
function fetchLatestSubmission() {
88
// Submissions are ordered by most recent first in the backend
9-
return Resource.fetchCollection({ channel: channelId, max_results: 1 }).then(response => {
9+
return Resource.fetchCollection({
10+
channel: channelId,
11+
max_results: 1,
12+
ordering: '-date_created',
13+
}).then(response => {
1014
if (response.results.length > 0) {
1115
return response.results[0];
1216
}

contentcuration/contentcuration/viewsets/community_library_submission.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
from contentcuration.viewsets.base import RESTCreateModelMixin
3030
from contentcuration.viewsets.base import RESTDestroyModelMixin
3131
from contentcuration.viewsets.base import RESTUpdateModelMixin
32+
from contentcuration.viewsets.base import ValuesViewsetOrderingFilter
3233
from contentcuration.viewsets.common import UserFilteredPrimaryKeyRelatedField
3334
from contentcuration.viewsets.sync.utils import (
3435
generate_added_to_community_library_event,
@@ -244,12 +245,15 @@ class CommunityLibrarySubmissionViewSetMixin:
244245
"resolved_by_name": get_resolved_by_name,
245246
"channel_name": lambda item: item.get("channel__name"),
246247
}
247-
queryset = CommunityLibrarySubmission.objects.all().order_by("-date_updated")
248-
filter_backends = [DjangoFilterBackend, SearchFilter]
248+
queryset = CommunityLibrarySubmission.objects.all()
249+
filter_backends = [DjangoFilterBackend, SearchFilter, ValuesViewsetOrderingFilter]
249250
filterset_class = CommunityLibrarySubmissionFilterSet
250251
search_fields = ["channel__name"]
251252
pagination_class = CommunityLibrarySubmissionPagination
252253

254+
ordering_fields = ["date_updated", "date_created"]
255+
ordering = "-date_updated"
256+
253257
def consolidate(self, items, queryset):
254258
countries = {}
255259
for (submission_id, country_code,) in Country.objects.filter(

0 commit comments

Comments
 (0)