tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/form-number-inclusive-range'

This commit is contained in:
Alexander A. Klimov 2018-04-12 14:32:38 +02:00
parent 5f24fffe7d 5cf51a70c8
commit 1280137eae
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
library/Icinga/Web/Form/Element/Number.php
View File

@ -46,11 +46,12 @@ class Number extends FormElement
*/
public function init()
{
if ($this->min !== null) {
$this->addValidator('GreaterThan', true, array('min' => $this->min));
}
if ($this->max !== null) {
$this->addValidator('LessThan', true, array('max' => $this->max));
if ($this->min !== null || $this->max !== null) {
$this->addValidator('Between', true, array(
'min' => $this->min === null ? -INF : $this->min,
'max' => $this->max === null ? INF : $this->max,
'inclusive' => true
));
}
}
@ -86,7 +87,7 @@ class Number extends FormElement
*/
public function setMax($max)
{
$this->max = (int) $max;
$this->max = (float) $max;
return $this;
}