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

Fixes #13932: Fix number validator attributes comparison

Browse Source
This commit is contained in:
Evgeniy Moiseenko
2018-10-19 23:56:30 +03:00
committed by Alexander Makarov
parent cfe0bf5cf1
commit dfe828f76b
3 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@ -4,6 +4,7 @@ Yii Framework 2 Change Log
2.0.16 under development 2.0.16 under development
------------------------ ------------------------
- Bug #13932: Fix number validator attributes comparison (uaoleg, s1lver)
- Bug #14039, #16636: Fixed validation for disabled inputs (s1lver, omzy83) - Bug #14039, #16636: Fixed validation for disabled inputs (s1lver, omzy83)
- Bug #16425: Check for additional values for disabled confirm dialog (Alex-Code, s1lver) - Bug #16425: Check for additional values for disabled confirm dialog (Alex-Code, s1lver)
- Enh #14367: In `yii\db\mysql\QueryBuilder` added support fractional seconds for time types for MySQL >= 5.6.4 (konstantin-vl) - Enh #14367: In `yii\db\mysql\QueryBuilder` added support fractional seconds for time types for MySQL >= 5.6.4 (konstantin-vl)

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

@ -282,12 +282,12 @@ yii.validation = (function ($) {
if (!$target.length) { if (!$target.length) {
$target = $form.find('[name="' + options.compareAttributeName + '"]'); $target = $form.find('[name="' + options.compareAttributeName + '"]');
} }
compareValue = $target.val(); compareValue = $target.val();
} }
if (options.type === 'number') { if (options.type === 'number') {
value = parseFloat(value); value = value ? parseFloat(value) : 0;
compareValue = parseFloat(compareValue); compareValue = compareValue ? parseFloat(compareValue) : 0;
} }
switch (options.operator) { switch (options.operator) {
case '==': case '==':

35
tests/js/tests/yii.validation.test.js
View File

@ -1518,6 +1518,41 @@ describe('yii.validation', function () {
{operator: '<', compareValue: '2', type: 'number'}, {operator: '<', compareValue: '2', type: 'number'},
false false
], ],
'number type, ">=" operator, 2nd is lower': [
10,
{operator: '>=', compareValue: 2, type: 'number'},
true
],
'number type, "<=" operator, 2nd is lower': [
10,
{operator: '<=', compareValue: 2, type: 'number'},
false
],
'number type, ">" operator, 2nd is lower': [
10,
{operator: '>', compareValue: 2, type: 'number'},
true
],
'number type, ">" operator, compare value undefined': [
undefined,
{operator: '>', compareValue: 2, type: 'number'},
false
],
'number type, "<" operator, compare value undefined': [
undefined,
{operator: '<', compareValue: 2, type: 'number'},
true
],
'number type, ">=" operator, compare value undefined': [
undefined,
{operator: '>=', compareValue: 2, type: 'number'},
false
],
'number type, "<=" operator, compare value undefined': [
undefined,
{operator: '<=', compareValue: 2, type: 'number'},
true
],
// default compare value // default compare value
'default compare value, "===" operator, against undefined': [undefined, {operator: '==='}, true] 'default compare value, "===" operator, against undefined': [undefined, {operator: '==='}, true]
}, function (value, options, expectValid) { }, function (value, options, expectValid) {