diff --git a/core/modules/node/src/Plugin/views/wizard/Node.php b/core/modules/node/src/Plugin/views/wizard/Node.php index d38beb6..55b80bb 100644 --- a/core/modules/node/src/Plugin/views/wizard/Node.php +++ b/core/modules/node/src/Plugin/views/wizard/Node.php @@ -167,7 +167,8 @@ protected function defaultDisplayFiltersUser(array $form, FormStateInterface $fo 'table' => 'taxonomy_index', 'field' => 'tid', 'value' => $tids, - 'vocabulary' => $form_state->getValue(array('show', 'tagged_with', 'vocabulary')), + 'vid' => $form_state->getValue(array('show', 'tagged_with', 'vocabulary')), + 'plugin_id' => 'taxonomy_index_tid', ); // If the user entered more than one valid term in the autocomplete // field, they probably intended both of them to be applied. diff --git a/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php b/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php index 0c5e193..d77cd60 100644 --- a/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php +++ b/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php @@ -863,12 +863,9 @@ protected function defaultDisplayOptions() { 'table' => $this->base_table, 'field' => $default_field, 'id' => $default_field, + 'plugin_id' => isset($data[$default_field]) ? $data[$default_field]['field']['id'] : '', ); - // Load the plugin ID and module. - $base_field = $data['table']['base']['field']; - $display_options['fields'][$base_field]['plugin_id'] = $data[$base_field]['field']['id']; - return $display_options; } diff --git a/core/modules/views/src/Tests/NewViewConfigSchemaTest.php b/core/modules/views/src/Tests/NewViewConfigSchemaTest.php index 7ee6862..d6bb92e 100644 --- a/core/modules/views/src/Tests/NewViewConfigSchemaTest.php +++ b/core/modules/views/src/Tests/NewViewConfigSchemaTest.php @@ -28,7 +28,7 @@ class NewViewConfigSchemaTest extends ViewTestBase { * * @var array */ - public static $modules = array('views_ui', 'node', 'comment', 'file', 'taxonomy', 'dblog'); + public static $modules = array('views_ui', 'node', 'comment', 'file', 'taxonomy', 'dblog', 'aggregator'); /** * Tests creating brand new views. @@ -37,7 +37,19 @@ public function testNewViews() { $this->drupalLogin($this->drupalCreateUser(array('administer views'))); // Create views with all core Views wizards. - $wizards = array('node', 'node_revision', 'users', 'comment', 'file_managed', 'taxonomy_term', 'watchdog'); + $wizards = array( + // Wizard with their own classes. + 'node', + 'node_revision', + 'users', + 'comment', + 'file_managed', + 'taxonomy_term', + 'watchdog', + // Standard derivative classes. + 'standard:aggregator_feed', + 'standard:aggregator_item', + ); foreach($wizards as $wizard_key) { $edit = array(); $edit['label'] = $this->randomString();