tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #7989 from open-sausages/pulls/4.0/bulk-through-bug 

BUG Fix many_many through crashing ModelAdmin
This commit is contained in:
Robbie Averill 2018-04-10 15:43:25 +12:00 committed by GitHub
parent 75a29b8b16 e11ba9a2d7
commit b6c6bd6af2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Dev/BulkLoader.php
View File

@ -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,
];
}
/**