From 8491842a0472161d54c86fdad97766fd20477428 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Mon, 3 Aug 2020 11:57:24 +0300 Subject: [PATCH] Try ordering via @property field order_by --- webapp/models.py | 2 +- webapp/serializers.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/webapp/models.py b/webapp/models.py index 663e943..0fefb96 100644 --- a/webapp/models.py +++ b/webapp/models.py @@ -106,7 +106,7 @@ class SignupForm(models.Model): @property def signups(self): - return Signup.objects.filter(signupForm=self) + return Signup.objects.filter(signupForm=self).order_by('pk') class Meta: verbose_name = _('Signup form') diff --git a/webapp/serializers.py b/webapp/serializers.py index e5f1536..0ea20ee 100644 --- a/webapp/serializers.py +++ b/webapp/serializers.py @@ -46,16 +46,16 @@ class SignupSerializer(serializers.ModelSerializer): class SignupFormSerializer(serializers.HyperlinkedModelSerializer): questions = serializers.JSONField() - signups = serializers.SerializerMethodField() + signups = serializers.SlugRelatedField( + slug_field='list_name', + read_only=True, + required=False, + ) class Meta: model = SignupForm fields = ('id', 'title', 'visible', 'start_time', 'end_time', 'questions', 'schema', 'signups', 'quota') - def get_signups(self, instance): - names = instance.list_name.order_by('pk') - return names - class EventSerializer(serializers.ModelSerializer): signupForm = SignupFormSerializer(