mirror of
https://github.com/silverstripe/silverstripe-reports
synced 2024-10-22 11:05:53 +02:00
BUGFIX: Fixed redirection destionation of the modeladmin delete button on the detail form. (from r97179)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102709 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
bce6ff833b
commit
88597e243a
@ -382,6 +382,7 @@ class ModelAdmin_CollectionController extends Controller {
|
|||||||
//$form->setFormAction(Controller::join_links($this->Link(), "search"));
|
//$form->setFormAction(Controller::join_links($this->Link(), "search"));
|
||||||
$form->setFormMethod('get');
|
$form->setFormMethod('get');
|
||||||
$form->setHTMLID("Form_SearchForm_" . $this->modelClass);
|
$form->setHTMLID("Form_SearchForm_" . $this->modelClass);
|
||||||
|
$form->disableSecurityToken();
|
||||||
$clearAction->useButtonTag = true;
|
$clearAction->useButtonTag = true;
|
||||||
$clearAction->addExtraClass('minorAction');
|
$clearAction->addExtraClass('minorAction');
|
||||||
|
|
||||||
@ -947,7 +948,7 @@ class ModelAdmin_RecordController extends Controller {
|
|||||||
public function doDelete($data, $form, $request) {
|
public function doDelete($data, $form, $request) {
|
||||||
if($this->currentRecord->canDelete(Member::currentUser())) {
|
if($this->currentRecord->canDelete(Member::currentUser())) {
|
||||||
$this->currentRecord->delete();
|
$this->currentRecord->delete();
|
||||||
Director::redirect($this->parentController->Link());
|
Director::redirect($this->parentController->Link('SearchForm?action=search'));
|
||||||
}
|
}
|
||||||
else Director::redirectBack();
|
else Director::redirectBack();
|
||||||
return;
|
return;
|
||||||
|
Loading…
Reference in New Issue
Block a user