Fixed validators that become enabled when made visible even when the …

…field isn't configured to be required
redbox-mint · Oct 23, 2023 · 148732b · 148732b
1 parent 17fa8b6
commit 148732b
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/angular-legacy/shared/form/field-contributor.component.ts b/angular-legacy/shared/form/field-contributor.component.ts
@@ -217,8 +217,6 @@ export class ContributorField extends FieldBase<any> implements CustomValidation
     if (this.required) {
       this.enableValidators();
     } else {
-      // disable the validators otherwise they'll get enabled on show/hide
-      this.validators = {};
       // if splitting names, attach handler to individual input form control
       if (this.splitNames) {
         const reqFields = ['family_name', 'given_name'];
@@ -532,15 +530,17 @@ export class ContributorField extends FieldBase<any> implements CustomValidation
         if (!that.visible) {
           // restore validators
           if (that.formModel) {       
+            if (that.required) {
               if(that['enableValidators'] != null && typeof(that['enableValidators']) == 'function') {
                 that['enableValidators']();
               } else {
                 that.formModel.setValidators(that.validators);
               }
-              setTimeout(() => {
-                that.setValue(that.formModel.value,false,true)
-              });
-              that.formModel.updateValueAndValidity();
+            }
+            setTimeout(() => {
+              that.setValue(that.formModel.value,false,true)
+            });
+            that.formModel.updateValueAndValidity();
           }
         }
       }