tonyair
/
GridFieldBulkEditingTools
mirror of https://github.com/colymba/GridFieldBulkEditingTools.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge 403196a440 into 3a3d33ffdc

This commit is contained in:
Tony Air 2013-05-04 14:01:10 -07:00
parent 3a3d33ffdc 403196a440
commit d9122c3fcb
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
code/GridFieldBulkImageUpload_Request.php
View File

@ -259,7 +259,30 @@ class GridFieldBulkImageUpload_Request extends RequestHandler {
$response = new SS_HTTPResponse($formHTML);
$response->addHeader('Content-Type', 'text/plain');
$response->addHeader('X-Title', 'SilverStripe - Bulk '.$this->gridField->list->dataClass.' Image Upload');
return $response;
if($request->isAjax()) {
return $response;
} else {
// If not requested by ajax, we need to render it within the controller context+template
$controller = $this->getToplevelController();
return $controller->customise(array(
'Content' => $response->getBody(),
));
}
}
/**
* Traverse up nested requests until we reach the first that's not a GridFieldDetailForm.
* The opposite of {@link Controller::curr()}, required because
* Controller::$controller_stack is not directly accessible.
*
* @return Controller
*/
protected function getToplevelController() {
$c = $this->controller;
while($c && $c instanceof GridFieldDetailForm) {
$c = $c->getController();
}
return $c;
}
/**