mirror of
https://github.com/colymba/GridFieldBulkEditingTools.git
synced 2024-10-22 11:05:57 +02:00
Merge branch '4.0' into 4.1
This commit is contained in:
commit
50974abea9
@ -107,7 +107,7 @@ class EditHandler extends Handler
|
||||
*/
|
||||
public function Link($action = null)
|
||||
{
|
||||
return Controller::join_links(parent::Link(), $this->stat('url_segment'), $action);
|
||||
return Controller::join_links(parent::Link(), static::config()->get('url_segment'), $action);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -128,16 +128,14 @@ class EditHandler extends Handler
|
||||
$actions->push(
|
||||
FormAction::create('doSave', _t('GRIDFIELD_BULKMANAGER_EDIT_HANDLER.SAVE_BTN_LABEL', 'Save all'))
|
||||
->setAttribute('id', 'bulkEditingSaveBtn')
|
||||
->addExtraClass('btn btn-success')
|
||||
->setAttribute('data-icon', 'accept')
|
||||
->addExtraClass('btn btn-success font-icon font-icon-save')
|
||||
->setUseButtonTag(true)
|
||||
);
|
||||
|
||||
$actions->push(
|
||||
FormAction::create('Cancel', _t('GRIDFIELD_BULKMANAGER_EDIT_HANDLER.CANCEL_BTN_LABEL', 'Cancel'))
|
||||
->setAttribute('id', 'bulkEditingUpdateCancelBtn')
|
||||
->addExtraClass('btn btn-danger cms-panel-link')
|
||||
->setAttribute('data-icon', 'decline')
|
||||
->addExtraClass('btn btn-danger cms-panel-link font-icon font-icon-cancel')
|
||||
->setAttribute('href', $one_level_up->Link)
|
||||
->setUseButtonTag(true)
|
||||
->setAttribute('src', '') //changes type to image so isn't hooked by default actions handlers
|
||||
@ -364,7 +362,7 @@ class EditHandler extends Handler
|
||||
'type' => 'Includes',
|
||||
'SilverStripe\\Admin\\LeftAndMain_EditForm',
|
||||
]);
|
||||
$form->addExtraClass('center cms-content');
|
||||
$form->addExtraClass('center cms-content flexbox-area-grow fill-height');
|
||||
$form->setAttribute('data-pjax-fragment', 'CurrentForm Content');
|
||||
|
||||
Requirements::javascript('colymba/gridfield-bulk-editing-tools:client/dist/js/main.js');
|
||||
|
Loading…
Reference in New Issue
Block a user