Mirrors/yii2
2
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2026-03-13 02:37:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-numbervalidator-comma-decimal-separator

Browse Source
This commit is contained in:
Alexander Makarov
2016-12-17 16:39:00 +03:00
committed by GitHub
parent 08054bba6d 4e32fb1eba
commit a7f0a3c147
134 changed files with 6154 additions and 620 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
framework/validators/NumberValidator.php
View File

@@ -141,6 +141,17 @@ class NumberValidator extends Validator
* @inheritdoc
*/
public function clientValidateAttribute($model, $attribute, $view)
{
ValidationAsset::register($view);
$options = $this->getClientOptions($model, $attribute);
return 'yii.validation.number(value, messages, ' . Json::htmlEncode($options) . ');';
}
/**
* @inheritdoc
*/
public function getClientOptions($model, $attribute)
{
$label = $model->getAttributeLabel($attribute);
@@ -173,8 +184,6 @@ class NumberValidator extends Validator
$options['skipOnEmpty'] = 1;
}
ValidationAsset::register($view);
return 'yii.validation.number(value, messages, ' . Json::htmlEncode($options) . ');';
return $options;
}
}