php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-10-31 10:39:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #14901: Fixed trim validation for radio/checkbox button

Browse Source
This commit is contained in:
Evgeniy Moiseenko
2018-08-04 01:06:15 +03:00
committed by Alexander Makarov
parent 001e4c5aed
commit b36639b288
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@ -3,6 +3,7 @@ Yii Framework 2 Change Log
2.0.16 under development 2.0.16 under development
------------------------ ------------------------
- Bug #14901: Fixed trim validation for radio/checkbox button (s1lver)
- Bug #16527: Fixed return content for `\yii\widgets\ActiveForm::run()` (carono) - Bug #16527: Fixed return content for `\yii\widgets\ActiveForm::run()` (carono)
- Bug #15826: Fixed JavaScript compareValidator in `yii.validation.js` for attributes not in rules (mgrechanik) - Bug #15826: Fixed JavaScript compareValidator in `yii.validation.js` for attributes not in rules (mgrechanik)
- Enh #16365: Added $filterOnFocusOut option for GridView (s1lver) - Enh #16365: Added $filterOnFocusOut option for GridView (s1lver)

10
framework/assets/yii.validation.js
View File

@ -236,9 +236,15 @@ yii.validation = (function ($) {
} }
}, },
trim: function ($form, attribute, options) { trim: function ($form, attribute, options, value) {
var $input = $form.find(attribute.input); var $input = $form.find(attribute.input);
var value = $input.val(); var isCheckAble = $input.find('[type=radio]').is('[type=radio]') || $input.find('[type=checkbox]').is('[type=checkbox]');
if (!isCheckAble) {
return value;
}
value = $input.val();
if (!options.skipOnEmpty || !pub.isEmpty(value)) { if (!options.skipOnEmpty || !pub.isEmpty(value)) {
value = $.trim(value); value = $.trim(value);
$input.val(value); $input.val(value);

2
framework/validators/FilterValidator.php
View File

@ -91,7 +91,7 @@ class FilterValidator extends Validator
ValidationAsset::register($view); ValidationAsset::register($view);
$options = $this->getClientOptions($model, $attribute); $options = $this->getClientOptions($model, $attribute);
return 'value = yii.validation.trim($form, attribute, ' . json_encode($options, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE) . ');'; return 'value = yii.validation.trim($form, attribute, ' . json_encode($options, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE) . ', value);';
} }
/** /**