tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-30 13:19:11 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #884 from icecaster/master

Browse Source 
Fix: scaffolded Enum dropdown field always returning empty string
This commit is contained in:
Ingo Schommer 2012-10-16 23:28:10 -07:00
commit ee3954d5d7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
model/fieldtypes/Enum.php
View File

@ -95,7 +95,9 @@ class Enum extends StringField {
if(!$name) $name = $this->name;
$field = new DropdownField($name, $title, $this->enumValues($hasEmpty), $value, $form);
$field->setEmptyString($emptyString);
if($hasEmpty) {
$field->setEmptyString($emptyString);
}
return $field;
}
@ -130,4 +132,4 @@ class Enum extends StringField {
? array_merge(array('' => ''), ArrayLib::valuekey($this->enum))
: ArrayLib::valuekey($this->enum);
}
}
}