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 branch '3.2' into 3.3

Browse Source
This commit is contained in:
Daniel Hensby 2016-07-14 11:56:35 +01:00
commit a2581b9cf7
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
forms/gridfield/GridFieldDetailForm.php
View File

@ -549,19 +549,19 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler {
$list->add($this->record, $extraData); $list->add($this->record, $extraData);
} catch(ValidationException $e) { } catch(ValidationException $e) {
$form->sessionMessage($e->getResult()->message(), 'bad', false); $form->sessionMessage($e->getResult()->message(), 'bad', false);
if ($controller->getRequest()->isAjax()) {
$responseNegotiator = new PjaxResponseNegotiator(array( $responseNegotiator = new PjaxResponseNegotiator(array(
'CurrentForm' => function() use(&$form) { 'CurrentForm' => function () use (&$form) {
return $form->forTemplate(); return $form->forTemplate();
}, },
'default' => function() use(&$controller) {
return $controller->redirectBack();
}
)); ));
if($controller->getRequest()->isAjax()){
$controller->getRequest()->addHeader('X-Pjax', 'CurrentForm'); $controller->getRequest()->addHeader('X-Pjax', 'CurrentForm');
}
return $responseNegotiator->respond($controller->getRequest()); return $responseNegotiator->respond($controller->getRequest());
} }
Session::set("FormInfo.{$form->FormName()}.errors", array());
Session::set("FormInfo.{$form->FormName()}.data", $form->getData());
return $controller->redirectBack();
}
// TODO Save this item into the given relationship // TODO Save this item into the given relationship