Merge branch '5.2' into 5.3

This commit is contained in:
Robbie Averill 2019-05-03 10:16:47 +12:00
commit c63a06cb91
2 changed files with 2 additions and 2 deletions

View File

@ -103,7 +103,7 @@ class UserFormFieldEditorExtension extends DataExtension
new GridFieldDeleteAction(), new GridFieldDeleteAction(),
new GridFieldToolbarHeader(), new GridFieldToolbarHeader(),
new GridFieldOrderableRows('Sort'), new GridFieldOrderableRows('Sort'),
new GridFieldDetailForm() new GridFieldDetailForm(null, false, false)
); );
$editButton->removeExtraClass('grid-field__icon-action--hidden-on-hover'); $editButton->removeExtraClass('grid-field__icon-action--hidden-on-hover');

View File

@ -258,7 +258,7 @@ SQL;
$config->addComponent(new GridFieldDeleteAction()); $config->addComponent(new GridFieldDeleteAction());
$config->addComponent(new GridFieldPageCount('toolbar-header-right')); $config->addComponent(new GridFieldPageCount('toolbar-header-right'));
$config->addComponent($pagination = new GridFieldPaginator(25)); $config->addComponent($pagination = new GridFieldPaginator(25));
$config->addComponent(new GridFieldDetailForm()); $config->addComponent(new GridFieldDetailForm(null, null, false));
$config->addComponent(new GridFieldButtonRow('after')); $config->addComponent(new GridFieldButtonRow('after'));
$config->addComponent($export = new GridFieldExportButton('buttons-after-left')); $config->addComponent($export = new GridFieldExportButton('buttons-after-left'));
$config->addComponent($print = new GridFieldPrintButton('buttons-after-left')); $config->addComponent($print = new GridFieldPrintButton('buttons-after-left'));