From fbbe4d8c2ee6b085138ae3b8b88cf12d71be6afc Mon Sep 17 00:00:00 2001 From: winkidney Date: Thu, 21 Feb 2019 18:11:08 +0800 Subject: [PATCH] Fix: Should use image_by_id as image-field name / add pagination --- core/views.py | 6 +++++- pinry/settings/base.py | 2 ++ pinry/static/js/pin-form.js | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/core/views.py b/core/views.py index 0be8806..9746368 100644 --- a/core/views.py +++ b/core/views.py @@ -1,4 +1,5 @@ from rest_framework import viewsets, mixins, routers +from rest_framework.filters import SearchFilter, OrderingFilter from rest_framework.viewsets import GenericViewSet from core import drf_api as api @@ -23,7 +24,10 @@ class ImageViewSet(mixins.CreateModelMixin, GenericViewSet): class PinViewSet(viewsets.ModelViewSet): queryset = Pin.objects.all() serializer_class = api.PinSerializer - filter_fields = ('submitter__username',) + filter_backends = (SearchFilter, OrderingFilter) + search_fields = ('=submitter__username', ) + ordering_fields = ('id', ) + ordering = ('id', ) permission_classes = [IsOwnerOrReadOnly("submitter"), ] diff --git a/pinry/settings/base.py b/pinry/settings/base.py index fbacfe7..54e895f 100644 --- a/pinry/settings/base.py +++ b/pinry/settings/base.py @@ -156,4 +156,6 @@ REST_FRAMEWORK = { 'django_filters.rest_framework.DjangoFilterBackend', ), 'URL_FIELD_NAME': DRF_URL_FIELD_NAME, + 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination', + 'PAGE_SIZE': 50, } diff --git a/pinry/static/js/pin-form.js b/pinry/static/js/pin-form.js index 9aeec93..8a57ccd 100644 --- a/pinry/static/js/pin-form.js +++ b/pinry/static/js/pin-form.js @@ -171,7 +171,7 @@ $(window).load(function() { tags: cleanTags($('#pin-form-tags').val()) }; if (uploadedImage) { - data.image_id = uploadedImage; + data.image_by_id = uploadedImage; } else { data.url = $('#pin-form-image-url').val(); }