fix merge conflict for edit dialog succeeded and pw not required

diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts
index 320b28284539dc72724ad4bcfa9a0c01fd42775d..01f455b7343430352af2f42908bf8f0819070900 100644 (file)
--- a/src-ui/src/app/components/manage/settings/settings.component.ts
+++ b/src-ui/src/app/components/manage/settings/settings.component.ts
@@ -620,7 +620,7 @@ export class SettingsComponent
     })
     modal.componentInstance.dialogMode = user ? 'edit' : 'create'
     modal.componentInstance.object = user
-    modal.componentInstance.success
+    modal.componentInstance.succeeded
       .pipe(takeUntil(this.unsubscribeNotifier))
       .subscribe({
         next: (newUser) => {
@@ -676,7 +676,7 @@ export class SettingsComponent
     })
     modal.componentInstance.dialogMode = group ? 'edit' : 'create'
     modal.componentInstance.object = group
-    modal.componentInstance.success
+    modal.componentInstance.succeeded
       .pipe(takeUntil(this.unsubscribeNotifier))
       .subscribe({
         next: (newGroup) => {

diff --git a/src/paperless/serialisers.py b/src/paperless/serialisers.py
index e60b3e019c5ca28c45dfab533b311a2ccb84a26a..a46d4897be38bc2110e50c094b09701f617dc4e9 100644 (file)
--- a/src/paperless/serialisers.py
+++ b/src/paperless/serialisers.py
@@ -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(),