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

Issue #1870410 by damiankloip: Inject display plugin manager into DisplayBag class.

8.0.x
catch 2013-01-07 13:38:15 +00:00
parent b272b9d406
commit a3a4347ffe
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/modules/views/lib/Drupal/views/DisplayBag.php
View File

@ -8,6 +8,7 @@
namespace Drupal\views;
use Drupal\Component\Plugin\PluginBag;
use Drupal\Component\Plugin\PluginManagerInterface;
/**
* A class which wraps the displays of a view so you can lazy-initialize them.
@ -21,14 +22,24 @@ class DisplayBag extends PluginBag {
*/
protected $view;
/**
* The manager used to instantiate the plugins.
*
* @var \Drupal\Component\Plugin\PluginManagerInterface
*/
protected $manager;
/**
* Constructs a DisplayBag object.
*
* @param \Drupal\views\ViewExecutable
* The view which has this displays attached.
* @param \Drupal\Component\Plugin\PluginManagerInterface $manager
* The manager to be used for instantiating plugins.
*/
public function __construct(ViewExecutable $view) {
public function __construct(ViewExecutable $view, PluginManagerInterface $manager) {
$this->view = $view;
$this->manager = $manager;
$this->initializePlugin('default');
@ -66,11 +77,11 @@ class DisplayBag extends PluginBag {
// Retrieve and initialize the new display handler with data.
$display = &$this->view->storage->getDisplay($display_id);
$this->pluginInstances[$display_id] = drupal_container()->get("plugin.manager.views.display")->createInstance($display['display_plugin']);
$this->pluginInstances[$display_id] = $this->manager->createInstance($display['display_plugin']);
if (empty($this->pluginInstances[$display_id])) {
// Provide a 'default' handler as an emergency. This won't work well but
// it will keep things from crashing.
$this->pluginInstances[$display_id] = drupal_container()->get("plugin.manager.views.display")->createInstance('default');
$this->pluginInstances[$display_id] = $this->manager->createInstance('default');
}
$this->pluginInstances[$display_id]->initDisplay($this->view, $display);

2
core/modules/views/lib/Drupal/views/ViewExecutable.php
View File

@ -597,7 +597,7 @@ class ViewExecutable {
}
// Initialize the display cache array.
$this->displayHandlers = new DisplayBag($this);
$this->displayHandlers = new DisplayBag($this, drupal_container()->get('plugin.manager.views.display'));
$this->current_display = 'default';
$this->display_handler = $this->displayHandlers['default'];