tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8637 from creative-commoners/pulls/4.4/falsy-detail-component

Browse Source 
FIX getComponentByType can return null - prevent null pointer errors
This commit is contained in:
Loz Calver 2018-11-26 18:28:26 +01:00 committed by GitHub
commit 441d079647
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Forms/GridField/GridFieldDetailForm_ItemRequest.php
View File

@ -284,9 +284,10 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler
$previousAndNextGroup->addExtraClass('circular-group mr-2');
$previousAndNextGroup->setFieldHolderTemplate(get_class($previousAndNextGroup) . '_holder_buttongroup');
/** @var GridFieldDetailForm $component */
$component = $this->gridField->getConfig()->getComponentByType(GridFieldDetailForm::class);
$gridState = $this->getRequest()->requestVar('gridState');
if ($component->getShowPagination()) {
if ($component && $component->getShowPagination()) {
$previousAndNextGroup->push(FormAction::create('doPrevious')
->setUseButtonTag(true)
->setAttribute('data-grid-state', $gridState)
@ -302,7 +303,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler
$rightGroup->push($previousAndNextGroup);
if ($component->getShowAdd()) {
if ($component && $component->getShowAdd()) {
$rightGroup->push(FormAction::create('doNew')
->setUseButtonTag(true)
->setAttribute('data-grid-state', $this->getRequest()->getVar('gridState'))