tonyair/silverstripe-gridfieldextensions
1
0
Fork 0
mirror of https://github.com/symbiote/silverstripe-gridfieldextensions.git synced 2024-10-22 17:05:39 +02:00
Code Issues Projects Releases Wiki Activity

API Check is instance of SS_List

Browse Source
This commit is contained in:
Steve Boyd 2024-10-21 16:04:04 +13:00
parent 718cc1304d
commit b4031bcd8e
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/GridFieldConfigurablePaginator.php
View File

@ -9,7 +9,6 @@ use SilverStripe\Forms\GridField\GridField_FormAction;
use SilverStripe\Forms\GridField\GridFieldPaginator; use SilverStripe\Forms\GridField\GridFieldPaginator;
use SilverStripe\Forms\GridField\GridState_Data; use SilverStripe\Forms\GridField\GridState_Data;
use SilverStripe\Model\List\ArrayList; use SilverStripe\Model\List\ArrayList;
use SilverStripe\Model\List\Limitable;
use SilverStripe\Model\List\SS_List; use SilverStripe\Model\List\SS_List;
use SilverStripe\ORM\UnsavedRelationList; use SilverStripe\ORM\UnsavedRelationList;
use SilverStripe\Model\ArrayData; use SilverStripe\Model\ArrayData;
@ -256,7 +255,7 @@ class GridFieldConfigurablePaginator extends GridFieldPaginator
$this->setItemsPerPage($state->pageSize); $this->setItemsPerPage($state->pageSize);
} }
if (!($dataList instanceof Limitable) || ($dataList instanceof UnsavedRelationList)) { if (!($dataList instanceof SS_List) || ($dataList instanceof UnsavedRelationList)) {
return $dataList; return $dataList;
} }

9
src/GridFieldNestedForm.php
View File

@ -23,7 +23,6 @@ use SilverStripe\Forms\GridField\GridFieldStateAware;
use SilverStripe\ORM\DataList; use SilverStripe\ORM\DataList;
use SilverStripe\ORM\DataObject; use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\DataObjectInterface; use SilverStripe\ORM\DataObjectInterface;
use SilverStripe\Model\List\Filterable;
use SilverStripe\ORM\Hierarchy\Hierarchy; use SilverStripe\ORM\Hierarchy\Hierarchy;
use SilverStripe\Model\List\SS_List; use SilverStripe\Model\List\SS_List;
use SilverStripe\Versioned\Versioned; use SilverStripe\Versioned\Versioned;
@ -362,7 +361,7 @@ class GridFieldNestedForm extends AbstractGridFieldComponent implements
throw new Exception('Max nesting level reached'); throw new Exception('Max nesting level reached');
} }
$list = $gridField->getList(); $list = $gridField->getList();
if (!$record && $request && $list instanceof Filterable) { if (!$record && $request && $list instanceof SS_List) {
$recordID = $request->param('RecordID'); $recordID = $request->param('RecordID');
$record = $list->byID($recordID); $record = $list->byID($recordID);
} }
@ -411,7 +410,7 @@ class GridFieldNestedForm extends AbstractGridFieldComponent implements
ModelData|null $record = null ModelData|null $record = null
) { ) {
$list = $gridField->getList(); $list = $gridField->getList();
if (!$record && $request && $list instanceof Filterable) { if (!$record && $request && $list instanceof SS_List) {
$recordID = $request->param('RecordID'); $recordID = $request->param('RecordID');
$record = $list->byID($recordID); $record = $list->byID($recordID);
} }
@ -460,7 +459,7 @@ class GridFieldNestedForm extends AbstractGridFieldComponent implements
} }
foreach ($request->postVars() as $key => $val) { foreach ($request->postVars() as $key => $val) {
$list = $gridField->getList(); $list = $gridField->getList();
if ($list instanceof Filterable if ($list instanceof SS_List
&& preg_match("/{$gridField->getName()}-{$postKey}-(\d+)/", $key, $matches) && preg_match("/{$gridField->getName()}-{$postKey}-(\d+)/", $key, $matches)
) { ) {
$recordID = $matches[1]; $recordID = $matches[1];
@ -482,7 +481,7 @@ class GridFieldNestedForm extends AbstractGridFieldComponent implements
&& is_a($gridField->getModelClass(), DataObject::class, true) && is_a($gridField->getModelClass(), DataObject::class, true)
&& DataObject::has_extension($gridField->getModelClass(), Hierarchy::class) && DataObject::has_extension($gridField->getModelClass(), Hierarchy::class)
&& $gridField->getForm()->getController() instanceof ModelAdmin && $gridField->getForm()->getController() instanceof ModelAdmin
&& $dataList instanceof Filterable && $dataList instanceof SS_List
) { ) {
$dataList = $dataList->filter('ParentID', 0); $dataList = $dataList->filter('ParentID', 0);
} }