Merge branch 'master' into next

# Conflicts: # src/Squidex/app/features/administration/pages/users/user-page.component.ts
Squidex · Jul 1, 2019 · b603049 · b603049
2 parents 37eddb8 + fa31a94
commit b603049
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ Please join our community forum: https://support.squidex.io
 
 ## Status
 
-Current Version v2.1.0. Roadmap: https://trello.com/b/KakM4F3S/squidex-roadmap
+Current Version v2.2.0. Roadmap: https://trello.com/b/KakM4F3S/squidex-roadmap
 
 ## Prerequisites
 

diff --git a/src/Squidex/app/features/administration/state/users.forms.ts b/src/Squidex/app/features/administration/state/users.forms.ts
@@ -24,7 +24,7 @@ export class UserForm extends Form<FormGroup, UpdateUserDto> {
             ],
             password: ['',
                 [
-                    Validators.nullValidator
+                    Validators.required
                 ]
             ],
             passwordConfirm: ['',
@@ -36,6 +36,16 @@ export class UserForm extends Form<FormGroup, UpdateUserDto> {
         }));
     }
 
+    public load(value: any) {
+        if (value) {
+            this.form.controls['password'].setValidators(Validators.nullValidator);
+        } else {
+            this.form.controls['password'].setValidators(Validators.required);
+        }
+
+        super.load(value);
+    }
+
     protected transformLoad(user: UpdateUserDto) {
         return { ...user, permissions: user.permissions.join('\n') };
     }