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

Issue #1888942 by dawehner: Rename viewStorageController::attachDisplays().

8.0.x
Dries 2013-01-16 08:20:26 -05:00
parent ee1b6de693
commit 32e23b5719
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/modules/views/lib/Drupal/views/ViewStorageController.php
View File

@ -35,7 +35,7 @@ class ViewStorageController extends ConfigStorageController {
*/ */
protected function attachLoad(&$queried_entities, $revision_id = FALSE) { protected function attachLoad(&$queried_entities, $revision_id = FALSE) {
foreach ($queried_entities as $id => $entity) { foreach ($queried_entities as $id => $entity) {
$this->attachDisplays($entity); $this->mergeDefaultDisplaysOptions($entity);
} }
parent::attachLoad($queried_entities, $revision_id); parent::attachLoad($queried_entities, $revision_id);
@ -70,16 +70,17 @@ class ViewStorageController extends ConfigStorageController {
$entity = parent::create($values); $entity = parent::create($values);
$this->attachDisplays($entity); $this->mergeDefaultDisplaysOptions($entity);
return $entity; return $entity;
} }
/** /**
* Add defaults to the display options. * Add defaults to the display options.
* *
* @param Drupal\Core\Entity\EntityInterface $entity * @param \Drupal\Core\Entity\EntityInterface $entity
* The view entity to attach default displays options.
*/ */
protected function attachDisplays(EntityInterface $entity) { protected function mergeDefaultDisplaysOptions(EntityInterface $entity) {
if (isset($entity->display) && is_array($entity->display)) { if (isset($entity->display) && is_array($entity->display)) {
$displays = array(); $displays = array();