From: Michael Shamoon <4887959+shamoon@users.noreply.github.com>
Date: Tue, 3 Jan 2023 16:29:36 +0000 (-0800)
Subject: include email + pw for frontend user editing
X-Git-Tag: v1.14.0-beta.rc1~109^2~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1eecd146d69561427c9601311dc442265c9526b;p=thirdparty%2Fpaperless-ngx.git

include email + pw for frontend user editing
---

diff --git a/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.html b/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.html
index 35c6a73bae..ec9cceae9e 100644
--- a/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.html
+++ b/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.html
@@ -8,6 +8,8 @@
       <div class="row">
         <div class="col">
           <app-input-text i18n-title title="Username" formControlName="username" [error]="error?.username"></app-input-text>
+          <app-input-text i18n-title title="Email" formControlName="email" [error]="error?.email"></app-input-text>
+          <app-input-password i18n-title title="Password" formControlName="password" [error]="error?.password"></app-input-password>
           <app-input-text i18n-title title="First name" formControlName="first_name" [error]="error?.first_name"></app-input-text>
           <app-input-text i18n-title title="Last name" formControlName="last_name" [error]="error?.first_name"></app-input-text>
 
diff --git a/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.ts b/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.ts
index 70dcd42afa..8adf6f324b 100644
--- a/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.ts
+++ b/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.ts
@@ -48,6 +48,8 @@ export class UserEditDialogComponent
   getForm(): FormGroup {
     return new FormGroup({
       username: new FormControl(''),
+      email: new FormControl(''),
+      password: new FormControl(null),
       first_name: new FormControl(''),
       last_name: new FormControl(''),
       is_active: new FormControl(true),
diff --git a/src/paperless/serialisers.py b/src/paperless/serialisers.py
index a46d4897be..63ddb773a6 100644
--- a/src/paperless/serialisers.py
+++ b/src/paperless/serialisers.py
@@ -31,6 +31,7 @@ class UserSerializer(serializers.ModelSerializer):
         fields = (
             "id",
             "username",
+            "email",
             "password",
             "first_name",
             "last_name",