Merge pull request #9 from gethinode/develop

Correct out of range error
gethinode · Feb 4, 2024 · 20d4daa · 20d4daa
2 parents 404e8af + 506969b
commit 20d4daa
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/layouts/partials/utilities/IsInvalidArgs.html b/layouts/partials/utilities/IsInvalidArgs.html
@@ -102,16 +102,11 @@
                     {{ warnf "[%s] argument '%s': unexpected value '%s'" $structure (string $key) $val }}
                     {{ $error = true }}
                 {{ end }}
-            {{ else if and $def.options.min (in (slice "int" "float" "float64") $actual) }}
-                {{ if lt $val $def.options.min }}
-                    {{ warnf "[%s] argument '%s': value '%s' out of range [$d, $d]" $structure (string $key) $val $def.options.min $def.options.max}}
+            {{ else if and (or $def.options.min $def.options.max) (in (slice "int" "float" "float64") $actual) }}
+                {{ if or (lt $val $def.options.min) (gt $val $def.options.max) }}
+                    {{ warnf "[%s] argument '%s': value '%s' out of range [%d, %d]" $structure (string $key) (string $val) $def.options.min $def.options.max}}
                     {{ $error = true }}
-                {{ end }}
-            {{ else if and $def.options.max (in (slice "int" "float" "float64") $actual) }}
-                {{ if (gt $val $def.options.max) }}
-                    {{ warnf "[%s] argument '%s': value '%s' out of range [$d, $d]" $structure (string $key) $val $def.options.min $def.options.max}}
-                    {{ $error = true }}
-                {{ end }}
+                {{ end }}            
             {{ end }}
         {{ end }}
     {{ end }}