Fix error reporting in array fields (closes #25)

stalwartlabs · Oct 6, 2024 · 2b293b1 · 2b293b1
1 parent 9d51767
commit 2b293b1
Showing 1 changed file with 25 additions and 20 deletions.
diff --git a/src/core/form.rs b/src/core/form.rs
@@ -504,6 +504,8 @@ impl FormData {
                         ..
                     } => {
                         let mut total_values = 0;
+                        let mut has_errors = false;
+
                         for (idx, result) in self
                             .array_value(field.id)
                             .map(|v| check.check_value(v.to_string()))
@@ -527,34 +529,37 @@ impl FormData {
                                             error: err.to_string(),
                                         },
                                     );
+                                    has_errors = true;
                                 }
                             }
                         }
 
-                        for validator in &check.validators {
-                            match validator {
-                                Validator::Required => {
-                                    if total_values == 0 {
-                                        self.new_error(field.id, "This field is required");
+                        if !has_errors {
+                            for validator in &check.validators {
+                                match validator {
+                                    Validator::Required => {
+                                        if total_values == 0 {
+                                            self.new_error(field.id, "This field is required");
+                                        }
                                     }
-                                }
-                                Validator::MinItems(min) => {
-                                    if total_values < *min {
-                                        self.new_error(
-                                            field.id,
-                                            format!("At least {min} items are required"),
-                                        );
+                                    Validator::MinItems(min) => {
+                                        if total_values < *min {
+                                            self.new_error(
+                                                field.id,
+                                                format!("At least {min} items are required"),
+                                            );
+                                        }
                                     }
-                                }
-                                Validator::MaxItems(max) => {
-                                    if total_values > *max {
-                                        self.new_error(
-                                            field.id,
-                                            format!("At most {max} items are allowed"),
-                                        );
+                                    Validator::MaxItems(max) => {
+                                        if total_values > *max {
+                                            self.new_error(
+                                                field.id,
+                                                format!("At most {max} items are allowed"),
+                                            );
+                                        }
                                     }
+                                    _ => (),
                                 }
-                                _ => (),
                             }
                         }
                     }