mirror of
https://github.com/paperless-ngx/paperless-ngx.git
synced 2025-12-10 16:46:50 +01:00
fix merge conflict for edit dialog succeeded and pw not required
This commit is contained in:
parent
a08467342c
commit
d840308392
2 changed files with 3 additions and 3 deletions
|
|
@ -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(),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue