Set a default background color for account avatar

[github/Chocobozzz/PeerTube.git] / client / src / app / shared / forms / form-reactive.ts

diff --git a/client/src/app/shared/forms/form-reactive.ts b/client/src/app/shared/forms/form-reactive.ts
index 2d0e8359f890cff19dbf1a1683af80cf7af57f89..6aec2937da4bf1eb5a42e7d649741781250cf38a 100644 (file)
--- a/client/src/app/shared/forms/form-reactive.ts
+++ b/client/src/app/shared/forms/form-reactive.ts
@@ -11,7 +11,7 @@ export abstract class FormReactive {
   protected formChanged = false
 
   form: FormGroup
-  formErrors: FormReactiveErrors
+  formErrors: any // To avoid casting in template because of string | FormReactiveErrors
   validationMessages: FormReactiveValidationMessages
 
   buildForm (obj: BuildFormArgument, defaultValues: BuildFormDefaultValues = {}) {
@@ -57,9 +57,9 @@ export abstract class FormReactive {
 
       // Don't care if dirty on force check
       const isDirty = control.dirty || forceCheck === true
-      if (control && isDirty && !control.valid) {
+      if (control && isDirty && control.enabled && !control.valid) {
         const messages = validationMessages[ field ]
-        for (const key in control.errors) {
+        for (const key of Object.keys(control.errors)) {
           formErrors[ field ] += messages[ key ] + ' '
         }
       }