yetangitu/funkwhale
1
0
Fork 0
mirror of https://code.eliotberriot.com/funkwhale/funkwhale.git synced 2025-10-04 04:39:16 +02:00
Code Issues Releases Wiki Activity

Fix #869: broken user admin for users with non-digit or letters in their username

Browse source
This commit is contained in:
Eliot Berriot 2019-06-27 14:50:56 +02:00
parent cbe496e47b
commit dc5db3a0c1
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
4 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
api/funkwhale_api/manage/serializers.py
View file

@ -44,12 +44,14 @@ class ManageUserSimpleSerializer(serializers.ModelSerializer):
class ManageUserSerializer(serializers.ModelSerializer):
permissions = PermissionsSerializer(source="*")
upload_quota = serializers.IntegerField(allow_null=True)
actor = serializers.SerializerMethodField()
class Meta:
model = users_models.User
fields = (
"id",
"username",
"actor",
"email",
"name",
"is_active",
@ -82,6 +84,10 @@ class ManageUserSerializer(serializers.ModelSerializer):
)
return instance
def get_actor(self, obj):
if obj.actor:
return ManageBaseActorSerializer(obj.actor).data
class ManageInvitationSerializer(serializers.ModelSerializer):
users = ManageUserSimpleSerializer(many=True, required=False)