tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Bugfix NumericField shows (none) for 0 on readonly

Browse Source
This commit is contained in:
muskie9 2014-11-02 20:55:23 -06:00
parent bd23ff0a3a
commit 082c49c1b5
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
forms/NumericField.php
View File

@ -44,4 +44,27 @@ class NumericField extends TextField {
public function dataValue() { public function dataValue() {
return (is_numeric($this->value)) ? $this->value : 0; return (is_numeric($this->value)) ? $this->value : 0;
} }
/**
* Returns a readonly version of this field
*/
public function performReadonlyTransformation() {
$field = new NumericField_Readonly($this->name, $this->title, $this->value);
$field->setForm($this->form);
return $field;
}
} }
class NumericField_Readonly extends ReadonlyField{
public function performReadonlyTransformation() {
return clone $this;
}
public function Value() {
return Convert::raw2xml($this->value ?
"$this->value" : "0");
}
}

3
tests/forms/NumericFieldTest.php
View File

@ -33,5 +33,8 @@ class NumericFieldTest extends SapphireTest {
$field->setValue('12.00'); $field->setValue('12.00');
$this->assertFalse($field->validate($validator)); $this->assertFalse($field->validate($validator));
$field->setValue(0);
$this->assertRegExp("#<span[^>]+>\s*0\s*<\/span>#", "".$field->performReadonlyTransformation()->Field()."");
} }
} }