fix merge conflict for edit dialog succeeded and pw not required

This commit is contained in:
Michael Shamoon
2023-01-01 17:55:52 -08:00
parent a7563f935e
commit 9d8ca0d8fd
2 changed files with 3 additions and 3 deletions

View File

@@ -18,7 +18,7 @@ class ObfuscatedUserPasswordField(serializers.Field):
class UserSerializer(serializers.ModelSerializer):
password = ObfuscatedUserPasswordField()
password = ObfuscatedUserPasswordField(required=False)
user_permissions = serializers.SlugRelatedField(
many=True,
queryset=Permission.objects.all(),