Merge remote-tracking branch 'origin/4.0' into 4.1
This commit is contained in:
commit
99426cdb05
|
@ -11,7 +11,7 @@ use SilverStripe\Forms\CheckboxSetField;
|
||||||
*/
|
*/
|
||||||
class DBMultiEnum extends DBEnum
|
class DBMultiEnum extends DBEnum
|
||||||
{
|
{
|
||||||
public function __construct($name, $enum = null, $default = null)
|
public function __construct($name = null, $enum = null, $default = null)
|
||||||
{
|
{
|
||||||
// MultiEnum needs to take care of its own defaults
|
// MultiEnum needs to take care of its own defaults
|
||||||
parent::__construct($name, $enum, null);
|
parent::__construct($name, $enum, null);
|
||||||
|
|
|
@ -6,9 +6,9 @@
|
||||||
$RadioLabel
|
$RadioLabel
|
||||||
$FieldHolder
|
$FieldHolder
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
|
||||||
<% end_if %>
|
<% end_if %>
|
||||||
<% end_loop %>
|
<% end_loop %>
|
||||||
|
</ul>
|
||||||
<% else %>
|
<% else %>
|
||||||
<ul class="SelectionGroup<% if extraClass %> $extraClass<% end_if %>">
|
<ul class="SelectionGroup<% if extraClass %> $extraClass<% end_if %>">
|
||||||
<% loop $FieldSet %>
|
<% loop $FieldSet %>
|
||||||
|
|
Loading…
Reference in New Issue