From 999198b1c53264825be92551ffa26b5712d38ae5 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Thu, 22 Feb 2018 22:01:51 +0100
Subject: [PATCH] Serialize user with requests
---
api/funkwhale_api/requests/serializers.py | 3 +++
api/funkwhale_api/requests/views.py | 2 +-
api/funkwhale_api/users/serializers.py | 6 ++++++
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/api/funkwhale_api/requests/serializers.py b/api/funkwhale_api/requests/serializers.py
index 8e830d3883..51a709514e 100644
--- a/api/funkwhale_api/requests/serializers.py
+++ b/api/funkwhale_api/requests/serializers.py
@@ -1,9 +1,12 @@
from rest_framework import serializers
+from funkwhale_api.users.serializers import UserBasicSerializer
+
from . import models
class ImportRequestSerializer(serializers.ModelSerializer):
+ user = UserBasicSerializer(read_only=True)
class Meta:
model = models.ImportRequest
diff --git a/api/funkwhale_api/requests/views.py b/api/funkwhale_api/requests/views.py
index b2dc78db00..345ff6f3bb 100644
--- a/api/funkwhale_api/requests/views.py
+++ b/api/funkwhale_api/requests/views.py
@@ -17,7 +17,7 @@ class ImportRequestViewSet(
viewsets.GenericViewSet):
serializer_class = serializers.ImportRequestSerializer
- queryset = models.ImportRequest.objects.all()
+ queryset = models.ImportRequest.objects.all().select_related()
search_fields = ['artist_name', 'album_name', 'comment']
def perform_create(self, serializer):
diff --git a/api/funkwhale_api/users/serializers.py b/api/funkwhale_api/users/serializers.py
index 261873bdbe..8c218b1c28 100644
--- a/api/funkwhale_api/users/serializers.py
+++ b/api/funkwhale_api/users/serializers.py
@@ -3,6 +3,12 @@ from rest_framework import serializers
from . import models
+class UserBasicSerializer(serializers.ModelSerializer):
+ class Meta:
+ model = models.User
+ fields = ['id', 'username', 'name', 'date_joined']
+
+
class UserSerializer(serializers.ModelSerializer):
permissions = serializers.SerializerMethodField()
--
GitLab