Skip to content

Commit 3efdf21

Browse files
committed
Merge branch 'hotfix/2.4.5'
2 parents 29e544c + da67850 commit 3efdf21

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

api/views/workflow.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ def get_queryset(self):
116116
return RawData.objects.filter(
117117
normalizeddata__changeset__changes__target_id=object_id,
118118
normalizeddata__changeset__changes__target_type__model=object_type
119-
).distinct('id')
119+
).distinct('id').select_related('source')
120120
else:
121-
return RawData.objects.all()
121+
return RawData.objects.all().select_related('source')
122122

123123

124124
class V1DataView(views.APIView):

project/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@
295295
REST_FRAMEWORK = {
296296
'PAGE_SIZE': 10,
297297
'EXCEPTION_HANDLER': 'rest_framework_json_api.exceptions.exception_handler',
298-
'DEFAULT_PAGINATION_CLASS': 'rest_framework_json_api.pagination.PageNumberPagination',
298+
'DEFAULT_PAGINATION_CLASS': 'api.pagination.FuzzyPageNumberPagination',
299299
'DEFAULT_PARSER_CLASSES': (
300300
'rest_framework_json_api.parsers.JSONParser',
301301
),

0 commit comments

Comments
 (0)