Commit 29817e45 authored by catch's avatar catch

Issue #2267453 by alexpott, dawehner, damiankloip: Fixed Views plugins do not...

Issue #2267453 by alexpott, dawehner, damiankloip: Fixed Views plugins do not store additional dependencies.
parent 04138345
......@@ -71,7 +71,6 @@ display:
empty_zero: false
link_to_node: true
plugin_id: node
provider: node
node_bulk_form:
id: node_bulk_form
table: node
......@@ -121,7 +120,6 @@ display:
empty_zero: false
hide_alter_empty: true
plugin_id: node_bulk_form
provider: node
filters:
status:
value: true
......@@ -132,7 +130,6 @@ display:
operator: ''
group: 1
plugin_id: boolean
provider: views
sorts:
created:
id: created
......@@ -140,7 +137,6 @@ display:
field: created
order: DESC
plugin_id: date
provider: views
title: form
page_1:
display_plugin: page
......@@ -169,7 +165,6 @@ display:
empty: true
content: 'This view is empty.'
plugin_id: text_custom
provider: views
base_field: nid
status: true
module: views
......
......@@ -13,11 +13,9 @@ display:
access:
type: none
options: { }
provider: views
cache:
type: none
options: { }
provider: views
query:
type: views_query
options:
......@@ -26,7 +24,6 @@ display:
replica: false
query_comment: false
query_tags: { }
provider: views
exposed_form:
type: basic
options:
......@@ -37,7 +34,6 @@ display:
expose_sort_order: true
sort_asc_label: Asc
sort_desc_label: Desc
provider: views
pager:
type: full
options:
......@@ -59,13 +55,10 @@ display:
first: '« first'
last: 'last »'
quantity: 9
provider: views
style:
type: default
provider: views
row:
type: 'entity:aggregator_item'
provider: views
fields:
iid:
table: aggregator_item
......
......@@ -17,17 +17,14 @@ display:
id: default
display_title: Master
position: 0
provider: views
display_options:
access:
type: perm
options:
perm: 'access news feeds'
provider: null
cache:
type: none
options: { }
provider: views
query:
type: views_query
options:
......@@ -36,7 +33,6 @@ display:
replica: false
query_comment: false
query_tags: { }
provider: views
exposed_form:
type: basic
options:
......@@ -47,7 +43,6 @@ display:
expose_sort_order: true
sort_asc_label: Asc
sort_desc_label: Desc
provider: views
pager:
type: full
options:
......@@ -82,11 +77,9 @@ display:
field: fid
id: fid
plugin_id: numeric
provider: views
relationship: none
group_type: group
admin_label: ''
dependencies: { }
label: ''
exclude: false
alter:
......@@ -152,7 +145,6 @@ display:
id: page_1
display_title: Page
position: 1
provider: views
display_options:
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
......@@ -169,7 +161,6 @@ display:
id: feed_1
display_title: Feed
position: 2
provider: views
display_options:
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
......@@ -177,7 +168,6 @@ display:
type: opml
options:
grouping: { }
provider: views
path: aggregator/opml
fields:
title:
......@@ -187,9 +177,6 @@ display:
relationship: none
group_type: group
admin_label: ''
dependencies:
module:
- aggregator
label: ''
exclude: false
alter:
......@@ -233,7 +220,6 @@ display:
hide_alter_empty: true
display_as_link: false
plugin_id: aggregator_title_link
provider: aggregator
url:
id: url
table: aggregator_feed
......@@ -241,9 +227,6 @@ display:
relationship: none
group_type: group
admin_label: ''
dependencies:
module:
- views
label: ''
exclude: false
alter:
......@@ -287,7 +270,6 @@ display:
hide_alter_empty: true
display_as_link: false
plugin_id: url
provider: views
description:
id: description
table: aggregator_feed
......@@ -295,9 +277,6 @@ display:
relationship: none
group_type: group
admin_label: ''
dependencies:
module:
- views
label: ''
exclude: false
alter:
......@@ -340,7 +319,6 @@ display:
empty_zero: false
hide_alter_empty: true
plugin_id: xss
provider: views
link:
id: link
table: aggregator_feed
......@@ -348,9 +326,6 @@ display:
relationship: none
group_type: group
admin_label: ''
dependencies:
module:
- views
label: ''
exclude: false
alter:
......@@ -394,7 +369,6 @@ display:
hide_alter_empty: true
display_as_link: false
plugin_id: url
provider: views
defaults:
fields: false
title: false
......@@ -409,7 +383,6 @@ display:
language_field: ''
xml_url_field: url
url_field: ''
provider: views
displays:
page_1: page_1
default: '0'
......
......@@ -31,14 +31,12 @@ display:
id: name
table: views_test_data
field: name
provider: views_test_data
title: test_view_block
block_1:
display_plugin: block
id: block_1
display_title: Block
position: null
provider: views
display_options:
field:
title:
......
......@@ -31,10 +31,8 @@ display:
id: name
table: views_test_data
field: name
provider: views_test_data
title: test_view_block2
block_1:
provider: views
display_plugin: block
id: block_1
display_title: Block
......@@ -44,7 +42,6 @@ display:
title:
link_to_node: true
block_2:
provider: views
display_plugin: block
id: block_2
display_title: Block
......@@ -54,7 +51,6 @@ display:
title:
link_to_node: true
block_3:
provider: views
display_plugin: block
id: block_3
display_title: Block
......
......@@ -22,22 +22,17 @@ display:
type: perm
options:
perm: 'access comments'
provider: user
cache:
type: none
provider: views
query:
type: views_query
provider: views
exposed_form:
type: basic
provider: views
pager:
type: some
options:
items_per_page: 10
offset: 0
provider: views
style:
type: html_list
options:
......@@ -47,7 +42,6 @@ display:
type: ul
wrapper_class: item-list
class: ''
provider: views
row:
type: fields
options:
......@@ -57,7 +51,6 @@ display:
changed: changed
separator: ' '
hide_empty: false
provider: views
relationships:
node:
field: node
......@@ -231,7 +224,6 @@ display:
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
block_1:
provider: views
display_plugin: block
id: block_1
display_title: Block
......
......@@ -141,7 +141,6 @@ protected function defaultDisplayOptions() {
// Add permission-based access control.
$display_options['access']['type'] = 'perm';
$display_options['access']['provider'] = 'user';
// Add a relationship to nodes.
$display_options['relationships']['node']['id'] = 'node';
......@@ -149,7 +148,6 @@ protected function defaultDisplayOptions() {
$display_options['relationships']['node']['field'] = 'node';
$display_options['relationships']['node']['required'] = 1;
$display_options['relationships']['node']['plugin_id'] = 'standard';
$display_options['relationships']['node']['provider'] = 'views';
// Remove the default fields, since we are customizing them here.
unset($display_options['fields']);
......@@ -158,7 +156,6 @@ protected function defaultDisplayOptions() {
$display_options['fields']['subject']['id'] = 'subject';
$display_options['fields']['subject']['table'] = 'comment_field_data';
$display_options['fields']['subject']['field'] = 'subject';
$display_options['fields']['subject']['provider'] = 'comment';
$display_options['fields']['subject']['label'] = '';
$display_options['fields']['subject']['alter']['alter_text'] = 0;
$display_options['fields']['subject']['alter']['make_link'] = 0;
......
......@@ -37,7 +37,6 @@ display:
id: node
required: true
table: comment_field_data
provider: views
fields:
subject:
id: subject
......@@ -57,7 +56,6 @@ display:
hide_empty: false
empty_zero: false
link_to_comment: true
provider: comment
filters: { }
sorts: { }
label: test_comment_rss
......
......@@ -20,7 +20,6 @@ display:
items_per_page: 25
table: node_field_data
plugin_id: argument_comment_user_uid
provider: comment
cache:
type: none
exposed_form:
......@@ -31,7 +30,6 @@ display:
id: nid
table: node
plugin_id: node
provider: node
pager:
type: full
query:
......
......@@ -18,19 +18,14 @@ display:
id: default
display_title: Master
position: 0
provider: views
display_options:
access:
type: perm
options:
perm: 'access content'
provider: user
dependencies: { }
cache:
type: none
options: { }
provider: views
dependencies: { }
query:
type: views_query
options:
......@@ -39,8 +34,6 @@ display:
replica: false
query_comment: false
query_tags: { }
provider: views
dependencies: { }
exposed_form:
type: basic
options:
......@@ -51,8 +44,6 @@ display:
expose_sort_order: true
sort_asc_label: Asc
sort_desc_label: Desc
provider: views
dependencies: { }
pager:
type: none
options:
......@@ -72,17 +63,14 @@ display:
field: node
required: true
plugin_id: standard
provider: views
relationship: none
group_type: group
admin_label: Content
dependencies: { }
fields:
subject:
id: subject
table: comment_field_data
field: subject
provider: comment
label: ''
alter:
alter_text: false
......@@ -99,7 +87,6 @@ display:
relationship: none
group_type: group
admin_label: ''
dependencies: { }
exclude: false
element_type: ''
element_class: ''
......@@ -120,9 +107,6 @@ display:
relationship: none
group_type: group
admin_label: ''
dependencies:
module:
- views
operator: contains
value: Comida
group: 1
......@@ -152,7 +136,6 @@ display:
default_group_multiple: { }
group_items: { }
plugin_id: string
provider: views
sorts: { }
title: 'Title filter page'
header: { }
......@@ -166,7 +149,6 @@ display:
id: page_tc
display_title: 'Title Comida'
position: 1
provider: views
display_options:
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
......@@ -177,7 +159,6 @@ display:
id: page_bp
display_title: 'Body Paris'
position: 1
provider: views
display_options:
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
......@@ -191,9 +172,6 @@ display:
relationship: none
group_type: group
admin_label: ''
dependencies:
module:
- views
operator: contains
value: Paris
group: 1
......@@ -223,7 +201,6 @@ display:
default_group_multiple: { }
group_items: { }
plugin_id: string
provider: views
defaults:
filters: false
filter_groups: false
......@@ -238,7 +215,6 @@ display:
id: page_tp
display_title: 'Title Paris'
position: 1
provider: views
display_options:
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
......@@ -252,10 +228,6 @@ display:
relationship: none
group_type: group
admin_label: ''
dependencies:
module:
- views
- views
operator: contains
value: Paris
group: 1
......@@ -285,7 +257,6 @@ display:
default_group_multiple: { }
group_items: { }
plugin_id: string
provider: views
defaults:
filters: false
filter_groups: false
......@@ -298,7 +269,6 @@ display:
id: page_bf
display_title: 'Body Comida'
position: 1
provider: views
display_options:
field_langcode: '***LANGUAGE_language_content***'
field_langcode_add_to_query: null
......@@ -312,10 +282,6 @@ display:
relationship: none
group_type: group
admin_label: ''
dependencies:
module:
- views
- views
operator: contains
value: Comida
group: 1
......@@ -345,7 +311,6 @@ display:
default_group_multiple: { }
group_items: { }
plugin_id: string
provider: views
defaults:
filters: false
filter_groups: false
......
......@@ -44,7 +44,6 @@ display:
link_to_user: true
format_username: true
plugin_id: user_name
provider: user
translation_link:
id: translation_link
table: users
......@@ -72,7 +71,6 @@ display:
group: true
exposed: false
plugin_id: numeric
provider: views
sorts:
created:
id: created
......@@ -80,7 +78,6 @@ display:
field: created
order: DESC
plugin_id: date
provider: views
title: People
empty:
area:
......@@ -91,7 +88,6 @@ display:
content: 'No people available.'
format: plain_text
plugin_id: text
provider: views
page_1:
display_plugin: page
id: page_1
......
......@@ -9,7 +9,6 @@ display:
id: entity_reference_1
display_title: EntityReference
position: null
provider: entity_reference
display_options:
style:
type: entity_reference
......@@ -92,7 +91,6 @@ display:
hide_alter_empty: true
link_to_node: true
plugin_id: node
provider: node
filters:
status:
value: true
......@@ -103,7 +101,6 @@ display:
operator: ''
group: 1
plugin_id: boolean
provider: views
sorts:
created:
id: created
......@@ -111,7 +108,6 @@ display:
field: created
order: DESC
plugin_id: date
provider: views
label: 'Entity reference'
module: entity_reference_test
id: test_entity_reference
......
......@@ -938,7 +938,7 @@ function field_langcode(EntityInterface $entity) {
/**
* {@inheritdoc}
*/
public function getDependencies() {
public function calculateDependencies() {
// Add the module providing the configured field storage as a dependency.
return array('config' => array($this->getFieldStorageConfig()->getConfigDependencyName()));
}
......
......@@ -83,6 +83,10 @@ public function testHandlerUI() {
$view->initHandlers();
$this->assertEqual($view->field['field_name_0']->options['type'], 'text_trimmed');
$this->assertEqual($view->field['field_name_0']->options['settings']['trim_length'], $random_number);
// Ensure that the view depends on the field storage.
$dependencies = \Drupal::service('config.manager')->findConfigEntityDependents('config', [$this->fieldStorages[0]->getConfigDependencyName()]);
$this->assertTrue(isset($dependencies['views.view.test_view_fieldapi']), 'The view is dependent on the field storage.');
}
/**
......
......@@ -13,19 +13,16 @@ display:
id: nid
table: node
plugin_id: node
provider: node
field_name_0:
id: field_name_0
table: node__field_name_0
field: field_name_0
plugin_id: field
provider: field
field_name_5:
id: field_name_5