From d8403083929ba4b6e829092e8e20aaa65a09f0a8 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+shamoon@users.noreply.github.com>
Date: Sun, 1 Jan 2023 17:55:52 -0800
Subject: [PATCH] fix merge conflict for edit dialog succeeded and pw not
 required

---
 .../src/app/components/manage/settings/settings.component.ts  | 4 ++--
 src/paperless/serialisers.py                                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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 320b28284..01f455b73 100644
--- 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 e60b3e019..a46d4897b 100644
--- 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(),