tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-30 08:29:28 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX Passing existing SS_HTTPResponse to PjaxResponseNegotiator in LeftAndMain so state like X-Status HTTP headers are retained (fixes #7427)

Browse Source
This commit is contained in:
Ingo Schommer 2012-06-13 00:27:03 +02:00
parent 9b3d3123b6
commit b1d95cffac
2 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
admin/code/LeftAndMain.php
View File

@ -430,20 +430,23 @@ class LeftAndMain extends Controller implements PermissionProvider {
public function getResponseNegotiator() {
if(!$this->responseNegotiator) {
$controller = $this;
$this->responseNegotiator = new PjaxResponseNegotiator(array(
'CurrentForm' => function() use(&$controller) {
return $controller->getEditForm()->forTemplate();
},
'Content' => function() use(&$controller) {
return $controller->renderWith($controller->getTemplatesWithSuffix('_Content'));
},
'Breadcrumbs' => function() use (&$controller) {
return $controller->renderWith('CMSBreadcrumbs');
},
'default' => function() use(&$controller) {
return $controller->renderWith($controller->getViewer('show'));
}
));
$this->responseNegotiator = new PjaxResponseNegotiator(
array(
'CurrentForm' => function() use(&$controller) {
return $controller->getEditForm()->forTemplate();
},
'Content' => function() use(&$controller) {
return $controller->renderWith($controller->getTemplatesWithSuffix('_Content'));
},
'Breadcrumbs' => function() use (&$controller) {
return $controller->renderWith('CMSBreadcrumbs');
},
'default' => function() use(&$controller) {
return $controller->renderWith($controller->getViewer('show'));
}
),
$this->response
);
}
return $this->responseNegotiator;
}

17
control/PjaxResponseNegotiator.php
View File

@ -20,12 +20,25 @@ class PjaxResponseNegotiator {
'default' => array('Director', 'redirectBack'),
);
protected $response = null;
/**
* @param RequestHandler $controller
* @param SS_HTTPResponse An existing response to reuse (optional)
* @param Array $callbacks
*/
function __construct($callbacks = array()) {
function __construct($callbacks = array(), $response = null) {
$this->callbacks = $callbacks;
$this->response = $response;
}
public function getResponse() {
if(!$this->response) $this->response = new SS_HTTPResponse();
return $this->response;
}
public function setResponse($response) {
$this->response = $response;
}
/**
@ -41,7 +54,7 @@ class PjaxResponseNegotiator {
public function respond(SS_HTTPRequest $request, $extraCallbacks = array()) {
// Prepare the default options and combine with the others
$callbacks = array_merge($this->callbacks, $extraCallbacks);
$response = new SS_HTTPResponse();
$response = $this->getResponse();
$responseParts = array();
if($fragmentStr = $request->getHeader('X-Pjax')) {