1. fix bug for wrong syntax in Field();

2. use this->extraClass() for returned string, rather than this->extraClass

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45588 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Normann Lou 2007-11-25 21:19:30 +00:00
parent e08acc08d1
commit 3c77cf9ea1

View File

@ -38,12 +38,12 @@ class OptionsetField extends DropdownField {
$odd = ($odd + 1) % 2; $odd = ($odd + 1) % 2;
$extraClass = $odd ? "odd" : "even"; $extraClass = $odd ? "odd" : "even";
$extraClass .= " val" . str_replace(' ','',$key); $extraClass .= " val" . str_replace(' ','',$key);
$this->disabled ? $disabled = " disabled=\"disabled\"" : $disable = ""; $disabled = $this->disabled ? 'disabled="disabled"' : $disable = '';
$options .= "<li class=\"".$extraClass."\"><input id=\"$itemID\" name=\"$this->name\" type=\"radio\" value=\"$key\"$checked $disabled/> <label for=\"$itemID\">$value</label></li>\n"; $options .= "<li class=\"".$extraClass."\"><input id=\"$itemID\" name=\"$this->name\" type=\"radio\" value=\"$key\"$checked $disabled/> <label for=\"$itemID\">$value</label></li>\n";
} }
$id = $this->id(); $id = $this->id();
return "<ul id=\"$id\" class=\"optionset {$this->extraClass}\">\n$options</ul>\n"; return "<ul id=\"$id\" class=\"optionset {$this->extraClass()}\">\n$options</ul>\n";
} }
protected $disabled = false; protected $disabled = false;
@ -51,8 +51,6 @@ class OptionsetField extends DropdownField {
$this->disabled = $val; $this->disabled = $val;
} }
function performReadonlyTransformation() { function performReadonlyTransformation() {
// Source and values are DataObject sets. // Source and values are DataObject sets.
$items = $this->source; $items = $this->source;