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

Fix inline editing when no extra fields were defined. Closes #9.

This commit is contained in:
ajshort 2013-03-03 19:21:42 +11:00
parent d9e226d8ad
commit 8fc1078437
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/GridFieldAddNewInlineButton.php
View File

@ -135,7 +135,7 @@ class GridFieldAddNewInlineButton implements GridField_HTMLProvider, GridField_S
$extra = array();
if($list instanceof ManyManyList) {
$extra = array_intersect_key($fields, $list->getExtraFields());
$extra = array_intersect_key($fields, (array) $list->getExtraFields());
}
$form->loadDataFrom($fields, Form::MERGE_CLEAR_MISSING);

4
code/GridFieldEditableColumns.php
View File

@ -73,7 +73,7 @@ class GridFieldEditableColumns extends GridFieldDataColumns implements
$extra = array();
if($list instanceof ManyManyList) {
$extra = array_intersect_key($fields, $list->getExtraFields());
$extra = array_intersect_key($fields, (array) $list->getExtraFields());
}
$form->loadDataFrom($fields, Form::MERGE_CLEAR_MISSING);
@ -148,7 +148,7 @@ class GridFieldEditableColumns extends GridFieldDataColumns implements
if(!$field && $list instanceof ManyManyList) {
$extra = $list->getExtraFields();
if(array_key_exists($col, $extra)) {
if($extra && array_key_exists($col, $extra)) {
$field = Object::create_from_string($extra[$col], $col)->scaffoldFormField();
}
}