mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Merge branch '4.1' into 4
This commit is contained in:
commit
af2c3886b9
@ -223,19 +223,30 @@ abstract class BulkLoader extends ViewableData
|
||||
**/
|
||||
public function getImportSpec()
|
||||
{
|
||||
$spec = array();
|
||||
$singleton = DataObject::singleton($this->objectClass);
|
||||
|
||||
// get database columns (fieldlabels include fieldname as a key)
|
||||
// using $$includerelations flag as false, so that it only contain $db fields
|
||||
$spec['fields'] = (array)singleton($this->objectClass)->fieldLabels(false);
|
||||
$fields = (array)$singleton->fieldLabels(false);
|
||||
|
||||
$has_ones = singleton($this->objectClass)->hasOne();
|
||||
$has_manys = singleton($this->objectClass)->hasMany();
|
||||
$many_manys = singleton($this->objectClass)->manyMany();
|
||||
// Merge relations
|
||||
$relations = array_merge(
|
||||
$singleton->hasOne(),
|
||||
$singleton->hasMany(),
|
||||
$singleton->manyMany()
|
||||
);
|
||||
|
||||
$spec['relations'] = (array)$has_ones + (array)$has_manys + (array)$many_manys;
|
||||
// Ensure description is string (e.g. many_many through)
|
||||
foreach ($relations as $name => $desc) {
|
||||
if (!is_string($desc)) {
|
||||
$relations[$name] = $name;
|
||||
}
|
||||
}
|
||||
|
||||
return $spec;
|
||||
return [
|
||||
'fields' => $fields,
|
||||
'relations' => $relations,
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -2,7 +2,7 @@
|
||||
<ul class="SelectionGroup<% if extraClass %> $extraClass<% end_if %>">
|
||||
<% loop $FieldSet %>
|
||||
<% if $Selected %>
|
||||
<li$Selected>
|
||||
<li class="selected">
|
||||
$RadioLabel
|
||||
$FieldHolder
|
||||
</li>
|
||||
@ -12,7 +12,7 @@
|
||||
<% else %>
|
||||
<ul class="SelectionGroup<% if extraClass %> $extraClass<% end_if %>">
|
||||
<% loop $FieldSet %>
|
||||
<li$Selected>
|
||||
<li <% if Selected %>class="selected"<% end_if %>>
|
||||
<label>{$RadioButton} {$RadioLabel}</label>
|
||||
<% if $FieldList %>
|
||||
$FieldHolder
|
||||
|
@ -10,8 +10,7 @@ use SilverStripe\Forms\SelectionGroup;
|
||||
|
||||
class SelectionGroupTest extends SapphireTest
|
||||
{
|
||||
|
||||
function testFieldHolder()
|
||||
public function testFieldHolder()
|
||||
{
|
||||
$items = array(
|
||||
new SelectionGroup_Item(
|
||||
@ -41,7 +40,34 @@ class SelectionGroupTest extends SapphireTest
|
||||
$this->assertContains('two view', (string)$listElTwo->div);
|
||||
}
|
||||
|
||||
function testLegacyItemsFieldHolder()
|
||||
public function testSelectedFieldHolder()
|
||||
{
|
||||
$items = array(
|
||||
new SelectionGroup_Item(
|
||||
'one',
|
||||
new LiteralField('one', 'one view'),
|
||||
'one title'
|
||||
),
|
||||
new SelectionGroup_Item(
|
||||
'two',
|
||||
new LiteralField('two', 'two view'),
|
||||
'two title'
|
||||
),
|
||||
);
|
||||
$field = new SelectionGroup('MyGroup', $items);
|
||||
$field->setValue('two');
|
||||
|
||||
$parser = new CSSContentParser($field->FieldHolder());
|
||||
$listEls = $parser->getBySelector('li');
|
||||
$listElOne = $listEls[0];
|
||||
$listElTwo = $listEls[1];
|
||||
|
||||
$this->assertEquals('one', (string)$listElOne->label[0]->input[0]['value']);
|
||||
$this->assertEquals('two', (string)$listElTwo->label[0]->input[0]['value']);
|
||||
$this->assertEquals('selected', (string)$listElTwo->attributes()->class);
|
||||
}
|
||||
|
||||
public function testLegacyItemsFieldHolder()
|
||||
{
|
||||
$items = array(
|
||||
'one' => new LiteralField('one', 'one view'),
|
||||
@ -60,7 +86,7 @@ class SelectionGroupTest extends SapphireTest
|
||||
$this->assertEquals(' two', (string)$listElTwo->label[0]);
|
||||
}
|
||||
|
||||
function testLegacyItemsFieldHolderWithTitle()
|
||||
public function testLegacyItemsFieldHolderWithTitle()
|
||||
{
|
||||
$items = array(
|
||||
'one//one title' => new LiteralField('one', 'one view'),
|
||||
|
Loading…
Reference in New Issue
Block a user