Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
entity
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
drupal.org
entity
Commits
c2c49954
Commit
c2c49954
authored
9 years ago
by
Bojan Zivanovic
Browse files
Options
Downloads
Patches
Plain Diff
Update RenderedEntity and test with dawehner's changes from the core issue.
parent
fc54bd66
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/Plugin/views/field/RenderedEntity.php
+9
-4
9 additions, 4 deletions
src/Plugin/views/field/RenderedEntity.php
src/Tests/Plugin/views/field/RenderedEntityTest.php
+59
-2
59 additions, 2 deletions
src/Tests/Plugin/views/field/RenderedEntityTest.php
with
68 additions
and
6 deletions
src/Plugin/views/field/RenderedEntity.php
+
9
−
4
View file @
c2c49954
...
@@ -111,11 +111,16 @@ class RenderedEntity extends FieldPluginBase implements CacheableDependencyInter
...
@@ -111,11 +111,16 @@ class RenderedEntity extends FieldPluginBase implements CacheableDependencyInter
*/
*/
public
function
render
(
ResultRow
$values
)
{
public
function
render
(
ResultRow
$values
)
{
$entity
=
$this
->
getEntityTranslation
(
$this
->
getEntity
(
$values
),
$values
);
$entity
=
$this
->
getEntityTranslation
(
$this
->
getEntity
(
$values
),
$values
);
if
(
isset
(
$entity
)
&&
$entity
->
access
(
'view'
))
{
$build
=
[];
$view_builder
=
$this
->
entityManager
->
getViewBuilder
(
$this
->
getEntityTypeId
());
if
(
isset
(
$entity
))
{
return
$view_builder
->
view
(
$entity
,
$this
->
options
[
'view_mode'
]);
$access
=
$entity
->
access
(
'view'
,
NULL
,
TRUE
);
$build
[
'#access'
]
=
$access
;
if
(
$access
->
isAllowed
())
{
$view_builder
=
$this
->
entityManager
->
getViewBuilder
(
$this
->
getEntityTypeId
());
$build
+=
$view_builder
->
view
(
$entity
,
$this
->
options
[
'view_mode'
]);
}
}
}
return
[]
;
return
$build
;
}
}
/**
/**
...
...
This diff is collapsed.
Click to expand it.
src/Tests/Plugin/views/field/RenderedEntityTest.php
+
59
−
2
View file @
c2c49954
...
@@ -13,6 +13,7 @@ use Drupal\field\Entity\FieldConfig;
...
@@ -13,6 +13,7 @@ use Drupal\field\Entity\FieldConfig;
use
Drupal\field\Entity\FieldStorageConfig
;
use
Drupal\field\Entity\FieldStorageConfig
;
use
Drupal\user\Entity\Role
;
use
Drupal\user\Entity\Role
;
use
Drupal\user\Entity\User
;
use
Drupal\user\Entity\User
;
use
Drupal\views\Entity\View
;
use
Drupal\views\Tests\ViewKernelTestBase
;
use
Drupal\views\Tests\ViewKernelTestBase
;
use
Drupal\views\Tests\ViewTestData
;
use
Drupal\views\Tests\ViewTestData
;
use
Drupal\views\Views
;
use
Drupal\views\Views
;
...
@@ -130,7 +131,12 @@ class RenderedEntityTest extends ViewKernelTestBase {
...
@@ -130,7 +131,12 @@ class RenderedEntityTest extends ViewKernelTestBase {
// The view should not display the body field.
// The view should not display the body field.
$view
=
Views
::
getView
(
'test_field_entity_test_rendered'
);
$view
=
Views
::
getView
(
'test_field_entity_test_rendered'
);
$build
=
$view
->
preview
();
$build
=
[
'#type'
=>
'view'
,
'#name'
=>
'test_field_entity_test_rendered'
,
'#view'
=>
$view
,
'#display_id'
=>
'default'
,
];
$renderer
=
\Drupal
::
service
(
'renderer'
);
$renderer
=
\Drupal
::
service
(
'renderer'
);
$renderer
->
renderPlain
(
$build
);
$renderer
->
renderPlain
(
$build
);
for
(
$i
=
1
;
$i
<=
3
;
$i
++
)
{
for
(
$i
=
1
;
$i
<=
3
;
$i
++
)
{
...
@@ -138,6 +144,9 @@ class RenderedEntityTest extends ViewKernelTestBase {
...
@@ -138,6 +144,9 @@ class RenderedEntityTest extends ViewKernelTestBase {
$search_result
=
strpos
(
$view_field
,
"Test
$i
"
)
!==
FALSE
;
$search_result
=
strpos
(
$view_field
,
"Test
$i
"
)
!==
FALSE
;
$this
->
assertFalse
(
$search_result
,
"The text 'Test
$i
' not found in the view."
);
$this
->
assertFalse
(
$search_result
,
"The text 'Test
$i
' not found in the view."
);
}
}
$this
->
assertConfigDependencies
(
$view
->
storage
);
$this
->
assertCacheabilityMetadata
(
$build
);
}
}
/**
/**
...
@@ -151,7 +160,12 @@ class RenderedEntityTest extends ViewKernelTestBase {
...
@@ -151,7 +160,12 @@ class RenderedEntityTest extends ViewKernelTestBase {
// The view should display the body field.
// The view should display the body field.
$view
=
Views
::
getView
(
'test_field_entity_test_rendered'
);
$view
=
Views
::
getView
(
'test_field_entity_test_rendered'
);
$build
=
$view
->
preview
();
$build
=
[
'#type'
=>
'view'
,
'#name'
=>
'test_field_entity_test_rendered'
,
'#view'
=>
$view
,
'#display_id'
=>
'default'
,
];
$renderer
=
\Drupal
::
service
(
'renderer'
);
$renderer
=
\Drupal
::
service
(
'renderer'
);
$renderer
->
renderPlain
(
$build
);
$renderer
->
renderPlain
(
$build
);
for
(
$i
=
1
;
$i
<=
3
;
$i
++
)
{
for
(
$i
=
1
;
$i
<=
3
;
$i
++
)
{
...
@@ -159,6 +173,49 @@ class RenderedEntityTest extends ViewKernelTestBase {
...
@@ -159,6 +173,49 @@ class RenderedEntityTest extends ViewKernelTestBase {
$search_result
=
strpos
(
$view_field
,
"Test
$i
"
)
!==
FALSE
;
$search_result
=
strpos
(
$view_field
,
"Test
$i
"
)
!==
FALSE
;
$this
->
assertTrue
(
$search_result
,
"The text 'Test
$i
' found in the view."
);
$this
->
assertTrue
(
$search_result
,
"The text 'Test
$i
' found in the view."
);
}
}
$this
->
assertConfigDependencies
(
$view
->
storage
);
$this
->
assertCacheabilityMetadata
(
$build
);
}
/**
* Ensures that the expected cacheability metadata is applied.
*
* @param array $build
* The render array
*/
protected
function
assertCacheabilityMetadata
(
$build
)
{
$this
->
assertEqual
([
'config:core.entity_view_display.entity_test.entity_test.foobar'
,
'config:views.view.test_field_entity_test_rendered'
,
'entity_test:1'
,
'entity_test:2'
,
'entity_test:3'
,
'entity_test_list'
,
'entity_test_view'
,
],
$build
[
'#cache'
][
'tags'
]);
$this
->
assertEqual
([
'entity_test_view_grants'
,
'languages:language_interface'
,
'theme'
,
'url.query_args'
,
'user.permissions'
,
],
$build
[
'#cache'
][
'contexts'
]);
}
/**
* Ensures that the config dependencies are calculated the right way.
*
* @param \Drupal\views\Entity\View $storage
* The view storage.
*/
protected
function
assertConfigDependencies
(
View
$storage
)
{
$storage
->
calculateDependencies
();
$this
->
assertEqual
([
'config'
=>
[
'core.entity_view_mode.entity_test.foobar'
],
'module'
=>
[
'entity_test'
],
],
$storage
->
getDependencies
());
}
}
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment