Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2358603 by Berdir: ViewsAjaxController results in fatal error for empty optional arguments

8.0.x
Nathaniel Catchpole 2014-11-26 10:39:50 +00:00
parent 0bfb32b55b
commit 5738f39ccd
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/modules/views/src/Controller/ViewAjaxController.php
View File

@ -79,6 +79,13 @@ class ViewAjaxController implements ContainerInjectionInterface {
if (isset($name) && isset($display_id)) { if (isset($name) && isset($display_id)) {
$args = $request->request->get('view_args'); $args = $request->request->get('view_args');
$args = isset($args) && $args !== '' ? explode('/', $args) : array(); $args = isset($args) && $args !== '' ? explode('/', $args) : array();
// Arguments can be empty, make sure they are passed on as NULL so that
// argument validation is not triggered.
$args = array_map(function ($arg) {
return ($arg == '' ? NULL : $arg);
}, $args);
$path = $request->request->get('view_path'); $path = $request->request->get('view_path');
$dom_id = $request->request->get('view_dom_id'); $dom_id = $request->request->get('view_dom_id');
$dom_id = isset($dom_id) ? preg_replace('/[^a-zA-Z0-9_-]+/', '-', $dom_id) : NULL; $dom_id = isset($dom_id) ? preg_replace('/[^a-zA-Z0-9_-]+/', '-', $dom_id) : NULL;
@ -130,8 +137,9 @@ class ViewAjaxController implements ContainerInjectionInterface {
// Reuse the same DOM id so it matches that in drupalSettings. // Reuse the same DOM id so it matches that in drupalSettings.
$view->dom_id = $dom_id; $view->dom_id = $dom_id;
$preview = $view->preview($display_id, $args); if ($preview = $view->preview($display_id, $args)) {
$response->addCommand(new ReplaceCommand(".view-dom-id-$dom_id", $this->drupalRender($preview))); $response->addCommand(new ReplaceCommand(".view-dom-id-$dom_id", $this->drupalRender($preview)));
}
return $response; return $response;
} }
else { else {

21
core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php
View File

@ -166,6 +166,27 @@ class ViewAjaxControllerTest extends UnitTestCase {
$this->assertViewResultCommand($response); $this->assertViewResultCommand($response);
} }
/**
* Tests a valid view with arguments.
*/
public function testAjaxViewWithEmptyArguments() {
$request = new Request();
$request->request->set('view_name', 'test_view');
$request->request->set('view_display_id', 'page_1');
// Simulate a request that has a second, empty argument.
$request->request->set('view_args', 'arg1/');
list($view, $executable) = $this->setupValidMocks();
$executable->expects($this->once())
->method('preview')
->with('page_1', $this->identicalTo(array('arg1', NULL)));
$response = $this->viewAjaxController->ajaxView($request);
$this->assertTrue($response instanceof ViewAjaxResponse);
$this->assertViewResultCommand($response);
}
/** /**
* Tests a valid view with a pager. * Tests a valid view with a pager.
*/ */