Skip to content

Commit fb37c46

Browse files
committed
fix(form): validators must show when more than 2 available
Signed-off-by: Thierry Bugier <tbugier@teclib.com>
1 parent d125c7c commit fb37c46

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

inc/form.class.php

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1248,19 +1248,17 @@ class='formcreator_form form_horizontal'>";
12481248
break;
12491249
}
12501250

1251-
switch (count($result)) {
1252-
case 1:
1253-
reset($validators);
1254-
$validatorId = key($validators);
1255-
echo Html::hidden('formcreator_validator', ['value' => $validatorId]);
1256-
break;
1257-
case 2:
1258-
$validators = [0 => Dropdown::EMPTY_VALUE] + $validators;
1259-
echo '<h2>' . __('Validation', 'formcreator') . '</h2>';
1260-
echo '<div class="form-group required liste" id="form-validator">';
1261-
echo '<label>' . __('Choose a validator', 'formcreator') . ' <span class="red">*</span></label>';
1262-
Dropdown::showFromArray('formcreator_validator', $validators);
1263-
break;
1251+
$resultCount = count($result);
1252+
if ($resultCount == 1) {
1253+
reset($validators);
1254+
$validatorId = key($validators);
1255+
echo Html::hidden('formcreator_validator', ['value' => $validatorId]);
1256+
} else if ($resultCount > 1) {
1257+
$validators = [0 => Dropdown::EMPTY_VALUE] + $validators;
1258+
echo '<h2>' . __('Validation', 'formcreator') . '</h2>';
1259+
echo '<div class="form-group required liste" id="form-validator">';
1260+
echo '<label>' . __('Choose a validator', 'formcreator') . ' <span class="red">*</span></label>';
1261+
Dropdown::showFromArray('formcreator_validator', $validators);
12641262
}
12651263
}
12661264

0 commit comments

Comments
 (0)