adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-03-25 19:09:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Making the form helper put the "required" class on all imputs that have a validation rule and does not explicitly sets allowEmpty => true in validation array

Browse source
This commit is contained in:
José Lorenzo Rodríguez 2010-02-27 22:58:27 -04:30
parent 056b87d13a
commit 0ca5c11e6c
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cake/libs/view/helpers/form.php
View file

@ -152,14 +152,11 @@ class FormHelper extends AppHelper {
}
foreach ($validateProperties as $rule => $validateProp) {
$rule = isset($validateProp['rule']) ? $validateProp['rule'] : false;
if ($rule) {
$rule = is_array($rule) ? array_shift($rule) : $rule;
$rule = is_string($rule) ? strtolower($rule) : $rule;
if (isset($validateProp['allowEmpty']) && $validateProp['allowEmpty'] === true) {
return false;
}
$required = empty($validateProp);
$required = $required || (!empty($rule) && $rule === 'notempty');
$required = $required || (isset($validateProp['allowEmpty']) && $validateProp['allowEmpty'] !== true);
$rule = isset($validateProp['rule']) ? $validateProp['rule'] : false;
$required = $rule || empty($validateProp);
if ($required) {
break;
}

2
cake/tests/cases/libs/view/helpers/form.test.php
View file

@ -108,7 +108,7 @@ class Contact extends CakeTestModel {
'imalsorequired' => array('rule' => 'alphaNumeric', 'allowEmpty' => false),
'imrequiredtoo' => array('rule' => 'notEmpty'),
'required_one' => array('required' => array('rule' => array('notEmpty'))),
'imnotrequired' => array('required' => false, 'rule' => 'alphaNumeric'),
'imnotrequired' => array('required' => false, 'rule' => 'alphaNumeric', 'allowEmpty' => true),
'imalsonotrequired' => array('alpha' => array('rule' => 'alphaNumeric','allowEmpty' => true),
'between' => array('rule' => array('between', 5, 30))));