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

ENH Reduce duplication of code in GridField view and edit buttons. (#9953) 

* ENH Reduce duplication of code in GridField view and edit buttons.

* Fix syntax error

Co-authored-by: Daniel Hensby <dhensby@users.noreply.github.com>

Co-authored-by: Daniel Hensby <dhensby@users.noreply.github.com>
This commit is contained in:
GuySartorelli 2021-07-19 03:54:22 +12:00 committed by GitHub
parent cc8287c99e
commit 4cd6b1434a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Forms/GridField/GridFieldEditButton.php
View File

@ -63,7 +63,7 @@ class GridFieldEditButton implements GridField_ColumnProvider, GridField_ActionP
/**
* @inheritdoc
*/
public function getUrl($gridField, $record, $columnName)
public function getUrl($gridField, $record, $columnName, $addState = true)
{
$link = Controller::join_links(
$gridField->Link('item'),
@ -71,7 +71,11 @@ class GridFieldEditButton implements GridField_ColumnProvider, GridField_ActionP
'edit'
);
return $this->getStateManager()->addStateToURL($gridField, $link);
if ($addState) {
$link = $this->getStateManager()->addStateToURL($gridField, $link);
}
return $link;
}
/**
@ -149,7 +153,7 @@ class GridFieldEditButton implements GridField_ColumnProvider, GridField_ActionP
// which can make the form readonly if no edit permissions are available.
$data = new ArrayData([
'Link' => Controller::join_links($gridField->Link('item'), $record->ID, 'edit'),
'Link' => $this->getURL($gridField, $record, $columnName, false),
'ExtraClass' => $this->getExtraClass()
]);

2
src/Forms/GridField/GridFieldViewButton.php
View File

@ -65,7 +65,7 @@ class GridFieldViewButton implements GridField_ColumnProvider, GridField_ActionM
return null;
}
$data = new ArrayData([
'Link' => Controller::join_links($field->Link('item'), $record->ID, 'view')
'Link' => $this->getURL($field, $record, $col),
]);
$template = SSViewer::get_templates_by_class($this, '', __CLASS__);
return $data->renderWith($template);