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

Issue #2549719 by dawehner: View::preRenderViewElement should use $element['view_build'] always

8.0.x
Alex Pott 2015-08-13 16:48:19 +01:00
parent b1fbb049a8
commit 57fb699bdd
3 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/views/src/Element/View.php
View File

@ -58,7 +58,7 @@ class View extends RenderElement {
if ($view && $view->access($element['#display_id'])) { if ($view && $view->access($element['#display_id'])) {
if (!empty($element['#embed'])) { if (!empty($element['#embed'])) {
$element += $view->preview($element['#display_id'], $element['#arguments']); $element['view_build'] = $view->preview($element['#display_id'], $element['#arguments']);
} }
else { else {
// Add contextual links to the view. We need to attach them to the dummy // Add contextual links to the view. We need to attach them to the dummy

13
core/modules/views/src/Tests/ViewElementTest.php
View File

@ -127,7 +127,7 @@ class ViewElementTest extends ViewTestBase {
// Set the content as our rendered array. // Set the content as our rendered array.
$render = $this->render; $render = $this->render;
$render['#embed'] = TRUE; $render['view']['#embed'] = TRUE;
$this->setRawContent($renderer->renderRoot($render)); $this->setRawContent($renderer->renderRoot($render));
$xpath = $this->xpath('//div[@class="views-element-container"]'); $xpath = $this->xpath('//div[@class="views-element-container"]');
@ -173,7 +173,7 @@ class ViewElementTest extends ViewTestBase {
// Test the render array again. // Test the render array again.
$render = $this->render; $render = $this->render;
$render['#embed'] = TRUE; $render['view']['#embed'] = TRUE;
$this->setRawContent($renderer->renderRoot($render)); $this->setRawContent($renderer->renderRoot($render));
// There should be 1 row in the results, 'John' arg 25. // There should be 1 row in the results, 'John' arg 25.
$xpath = $this->xpath('//div[@class="view-content"]/div'); $xpath = $this->xpath('//div[@class="view-content"]/div');
@ -183,6 +183,15 @@ class ViewElementTest extends ViewTestBase {
$this->drupalGet('views_test_data_element_embed_form'); $this->drupalGet('views_test_data_element_embed_form');
$xpath = $this->xpath('//div[@class="view-content"]/div'); $xpath = $this->xpath('//div[@class="view-content"]/div');
$this->assertEqual(count($xpath), 1); $this->assertEqual(count($xpath), 1);
// Tests the render array with an exposed filter.
$render = $this->render;
$render['view']['#display_id'] = 'embed_2';
$render['view']['#embed'] = TRUE;
$this->setRawContent($renderer->renderRoot($render));
// Ensure that the exposed form is rendered.
$this->assertEqual(1, count($this->xpath('//form[@class="views-exposed-form"]')));
} }
} }

37
core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_embed.yml
View File

@ -59,3 +59,40 @@ display:
display_title: Embedded display_title: Embedded
id: embed_1 id: embed_1
position: 1 position: 1
embed_2:
display_options:
defaults:
filters: false
exposed_form: false
exposed_form:
type: basic
options:
submit_button: Filter
reset_button: true
reset_button_label: Reset
exposed_sorts_label: 'Sort by'
expose_sort_order: true
sort_asc_label: Asc
sort_desc_label: Desc
filters:
id:
field: id
id: id
relationship: none
table: views_test_data
plugin_id: numeric
exposed: true
expose:
operator_id: ''
label: Id
description: ''
identifier: id
required: false
remember: false
multiple: false
remember_roles:
authenticated: authenticated
display_plugin: embed
display_title: Embedded
id: embed_2
position: 2