From 13ad7f578f27dadf91fb024b887fdfa24203edd4 Mon Sep 17 00:00:00 2001 From: Lucas D Hedding Date: Sat, 29 Jun 2013 13:23:11 -0500 Subject: [PATCH] Issue #1825896 by dawehner, damiankloip, heddn: Add module owner to plugin data on display handlers. --- .../config/views.view.test_bulk_form.yml | 4 ++++ .../test_views/views.view.test_view_block.yml | 1 + .../test_views/views.view.test_view_block2.yml | 1 + .../test_views/views.view.test_comment_rss.yml | 2 ++ .../views.view.test_comment_user_uid.yml | 2 ++ .../views.view.test_entity_translations_link.yml | 4 ++++ .../config/views.view.test_entity_reference.yml | 3 +++ .../test_views/views.view.test_view_fieldapi.yml | 2 ++ .../test_views/views.view.file_extension_view.yml | 4 ++++ .../test_views/views.view.test_forum_index.yml | 3 +++ core/modules/node/config/views.view.content.yml | 15 +++++++++++++++ core/modules/node/config/views.view.frontpage.yml | 7 +++++++ .../test_views/views.view.test_field_type.yml | 1 + .../views.view.test_filter_node_uid_revision.yml | 2 ++ .../test_views/views.view.test_node_bulk_form.yml | 3 +++ .../views.view.test_node_revision_nid.yml | 5 +++++ .../views.view.test_node_revision_vid.yml | 5 +++++ .../test_views/views.view.test_node_row_plugin.yml | 1 + .../test_views/views.view.test_node_view.yml | 4 ++++ .../test_views/views.view.test_status_extra.yml | 15 +++++++++------ .../views.view.test_serializer_display_entity.yml | 1 + .../views.view.test_serializer_display_field.yml | 4 ++++ .../views.view.test_statistics_integration.yml | 6 ++++++ .../test_views/views.view.test_groupwise_term.yml | 4 ++++ .../views.view.test_taxonomy_node_term_data.yml | 6 ++++++ .../views.view.test_tracker_user_uid.yml | 3 +++ .../user/config/views.view.user_admin_people.yml | 13 +++++++++++++ .../Drupal/user/Plugin/views/field/UserData.php | 14 +++++++------- .../lib/Drupal/user/Tests/Views/UserDataTest.php | 2 +- .../test_views/views.view.test_groupwise_user.yml | 5 +++++ ...w.test_plugin_argument_default_current_user.yml | 2 ++ .../test_views/views.view.test_user_bulk_form.yml | 4 ++++ .../test_views/views.view.test_user_data.yml | 7 +++++-- .../test_views/views.view.test_user_name.yml | 2 ++ .../views.view.test_user_relationship.yml | 3 +++ .../views.view.test_user_uid_argument.yml | 6 ++++-- ...views.view.test_view_argument_validate_user.yml | 1 + .../views.view.test_views_handler_field_role.yml | 3 +++ ...ews.view.test_views_handler_field_user_name.yml | 1 + core/modules/views/config/views.view.archive.yml | 4 ++++ core/modules/views/config/views.view.backlinks.yml | 7 +++++++ .../views/config/views.view.comments_recent.yml | 9 +++++++++ core/modules/views/config/views.view.glossary.yml | 6 ++++++ .../views/config/views.view.taxonomy_term.yml | 5 +++++ core/modules/views/config/views.view.tracker.yml | 11 +++++++++++ .../Plugin/Discovery/ViewsHandlerDiscovery.php | 7 +++++-- .../views/Plugin/views/wizard/WizardPluginBase.php | 17 ++++++++++++----- .../lib/Drupal/views/Tests/ViewStorageTest.php | 2 ++ .../views/lib/Drupal/views/ViewExecutable.php | 3 +++ .../test_views/views.view.test_aggregate_count.yml | 2 ++ .../test_views/views.view.test_alias.yml | 2 ++ .../test_views/views.view.test_area_title.yml | 6 +++++- .../test_views/views.view.test_argument_date.yml | 8 ++++++++ ...ews.view.test_argument_default_current_user.yml | 2 ++ .../views.view.test_argument_default_fixed.yml | 2 ++ .../test_views/views.view.test_attachment_ui.yml | 4 ++-- .../test_views/views.view.test_cache.yml | 4 ++++ .../test_views/views.view.test_click_sort.yml | 3 +++ .../test_views/views.view.test_destroy.yml | 20 ++++++++++++++++++++ .../test_views/views.view.test_display.yml | 3 +++ .../views.view.test_display_attachment.yml | 1 + .../views.view.test_display_defaults.yml | 2 ++ .../test_views/views.view.test_display_invalid.yml | 1 + .../test_views/views.view.test_display_more.yml | 2 ++ .../test_views/views.view.test_dropbutton.yml | 6 ++++++ .../test_views/views.view.test_entity_area.yml | 6 +++++- .../views.view.test_entity_type_filter.yml | 3 +++ .../test_views/views.view.test_example_area.yml | 3 +++ .../views.view.test_exposed_admin_ui.yml | 3 +++ .../test_views/views.view.test_feed_display.yml | 3 +++ .../test_views/views.view.test_field_classes.yml | 1 + .../views.view.test_field_get_entity.yml | 5 +++++ .../test_views/views.view.test_field_output.yml | 1 + .../test_views/views.view.test_field_tokens.yml | 4 ++++ .../test_views/views.view.test_field_type.yml | 1 + .../test_views/views.view.test_filter.yml | 2 ++ .../views.view.test_filter_date_between.yml | 2 ++ .../views.view.test_filter_group_override.yml | 2 ++ .../test_views/views.view.test_filter_groups.yml | 8 ++++++++ .../views.view.test_filter_in_operator_ui.yml | 1 + .../views.view.test_get_attach_displays.yml | 3 +++ .../test_views/views.view.test_glossary.yml | 2 ++ .../test_views/views.view.test_group_by_count.yml | 2 ++ .../views.view.test_group_by_in_filters.yml | 2 ++ .../views.view.test_handler_relationships.yml | 3 +++ .../views.view.test_handler_test_access.yml | 8 ++++++++ .../test_views/views.view.test_history.yml | 6 ++++++ .../test_views/views.view.test_mini_pager.yml | 6 ++++-- .../test_views/views.view.test_page_display.yml | 1 + .../views.view.test_page_display_arguments.yml | 5 +++++ .../views.view.test_page_display_menu.yml | 1 + .../views.view.test_page_display_route.yml | 9 +++++++++ .../test_views/views.view.test_page_view.yml | 3 ++- .../test_views/views.view.test_preview.yml | 8 +++++++- .../test_views/views.view.test_redirect_view.yml | 3 +++ .../test_views/views.view.test_reset_button.yml | 1 + .../test_views/views.view.test_simple_argument.yml | 5 +++++ .../test_views/views.view.test_style_mapping.yml | 4 ++++ .../test_views/views.view.test_table.yml | 12 ++++++++---- .../test_views/views.view.test_tokens.yml | 3 +++ .../test_views/views.view.test_view.yml | 4 ++++ ...ws.view.test_view_argument_validate_numeric.yml | 1 + .../views.view.test_view_argument_validate_php.yml | 1 + .../test_views/views.view.test_view_empty.yml | 1 + .../views.view.test_view_handler_weight.yml | 7 +++++++ ...ew.test_view_pager_full_zero_items_per_page.yml | 1 + .../test_views/views.view.test_view_render.yml | 4 ++++ .../test_views/views.view.test_view_storage.yml | 4 +++- .../views.view.test_views_groupby_save.yml | 2 +- 109 files changed, 428 insertions(+), 39 deletions(-) diff --git a/core/modules/action/tests/action_bulk_test/config/views.view.test_bulk_form.yml b/core/modules/action/tests/action_bulk_test/config/views.view.test_bulk_form.yml index 4973c62..a16655c 100644 --- a/core/modules/action/tests/action_bulk_test/config/views.view.test_bulk_form.yml +++ b/core/modules/action/tests/action_bulk_test/config/views.view.test_bulk_form.yml @@ -72,6 +72,7 @@ display: empty_zero: '0' link_to_node: '1' plugin_id: node + provider: node action_bulk_form: id: action_bulk_form table: action @@ -121,6 +122,7 @@ display: empty_zero: '0' hide_alter_empty: '1' plugin_id: action_bulk_form + provider: action filters: status: value: '1' @@ -131,6 +133,7 @@ display: operator: '0' group: '1' plugin_id: boolean + provider: views sorts: created: id: created @@ -138,6 +141,7 @@ display: field: created order: DESC plugin_id: date + provider: views title: form page_1: display_plugin: page diff --git a/core/modules/block/tests/block_test_views/test_views/views.view.test_view_block.yml b/core/modules/block/tests/block_test_views/test_views/views.view.test_view_block.yml index 2897bfa..f4723b1 100644 --- a/core/modules/block/tests/block_test_views/test_views/views.view.test_view_block.yml +++ b/core/modules/block/tests/block_test_views/test_views/views.view.test_view_block.yml @@ -31,6 +31,7 @@ display: id: name table: views_test_data field: name + provider: views_test_data title: test_view_block block_1: display_plugin: block diff --git a/core/modules/block/tests/block_test_views/test_views/views.view.test_view_block2.yml b/core/modules/block/tests/block_test_views/test_views/views.view.test_view_block2.yml index eb257e1..e693732 100644 --- a/core/modules/block/tests/block_test_views/test_views/views.view.test_view_block2.yml +++ b/core/modules/block/tests/block_test_views/test_views/views.view.test_view_block2.yml @@ -31,6 +31,7 @@ display: id: name table: views_test_data field: name + provider: views_test_data title: test_view_block2 block_1: display_plugin: block diff --git a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rss.yml b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rss.yml index d9901aa..e87ac87 100644 --- a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rss.yml +++ b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rss.yml @@ -30,6 +30,7 @@ display: table: comment field: nid required: '1' + provider: views fields: subject: id: subject @@ -49,6 +50,7 @@ display: hide_empty: '0' empty_zero: '0' link_to_comment: '1' + provider: comment filters: { } sorts: { } feed_1: diff --git a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_user_uid.yml b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_user_uid.yml index c67a240..d7c3f3e 100644 --- a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_user_uid.yml +++ b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_user_uid.yml @@ -20,6 +20,7 @@ display: items_per_page: '25' table: node_field_data plugin_id: argument_comment_user_uid + provider: comment cache: type: none exposed_form: @@ -30,6 +31,7 @@ display: id: nid table: node plugin_id: node + provider: node pager: type: full query: diff --git a/core/modules/content_translation/tests/modules/content_translation_test_views/test_views/views.view.test_entity_translations_link.yml b/core/modules/content_translation/tests/modules/content_translation_test_views/test_views/views.view.test_entity_translations_link.yml index ac1f7a2..8d530cc 100644 --- a/core/modules/content_translation/tests/modules/content_translation_test_views/test_views/views.view.test_entity_translations_link.yml +++ b/core/modules/content_translation/tests/modules/content_translation_test_views/test_views/views.view.test_entity_translations_link.yml @@ -44,6 +44,7 @@ display: link_to_user: '1' format_username: '1' plugin_id: user_name + provider: user translation_link: id: translation_link table: users @@ -71,6 +72,7 @@ display: group: '1' exposed: '0' plugin_id: numeric + provider: views sorts: created: id: created @@ -78,6 +80,7 @@ display: field: created order: DESC plugin_id: date + provider: views title: People empty: area: @@ -88,6 +91,7 @@ display: content: 'No people available.' format: plain_text plugin_id: text + provider: views page_1: display_plugin: page id: page_1 diff --git a/core/modules/entity_reference/tests/modules/entity_reference_test/config/views.view.test_entity_reference.yml b/core/modules/entity_reference/tests/modules/entity_reference_test/config/views.view.test_entity_reference.yml index 94d1329..5d52f25 100644 --- a/core/modules/entity_reference/tests/modules/entity_reference_test/config/views.view.test_entity_reference.yml +++ b/core/modules/entity_reference/tests/modules/entity_reference_test/config/views.view.test_entity_reference.yml @@ -47,6 +47,7 @@ display: hide_empty: '0' empty_zero: '0' link_to_node: '1' + provider: node filters: status: value: '1' @@ -56,12 +57,14 @@ display: expose: operator: '0' group: '1' + provider: views sorts: created: id: created table: node_field_data field: created order: DESC + provider: views entity_reference_1: display_plugin: entity_reference id: entity_reference_1 diff --git a/core/modules/field/tests/modules/field_test_views/test_views/views.view.test_view_fieldapi.yml b/core/modules/field/tests/modules/field_test_views/test_views/views.view.test_view_fieldapi.yml index 8d55b5a..940848f 100644 --- a/core/modules/field/tests/modules/field_test_views/test_views/views.view.test_view_fieldapi.yml +++ b/core/modules/field/tests/modules/field_test_views/test_views/views.view.test_view_fieldapi.yml @@ -13,11 +13,13 @@ display: id: nid table: node plugin_id: node + provider: node field_name_0: id: field_name_0 table: field_data_field_name_0 field: field_name_0 plugin_id: field + provider: field cache: type: none exposed_form: diff --git a/core/modules/file/tests/modules/file_test_views/test_views/views.view.file_extension_view.yml b/core/modules/file/tests/modules/file_test_views/test_views/views.view.file_extension_view.yml index fac765f..02cc72c 100644 --- a/core/modules/file/tests/modules/file_test_views/test_views/views.view.file_extension_view.yml +++ b/core/modules/file/tests/modules/file_test_views/test_views/views.view.file_extension_view.yml @@ -17,18 +17,21 @@ display: relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data id: field: id id: id relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data name: field: name id: file_extension relationship: none table: views_test_data plugin_id: string + provider: views_test_data pager: options: offset: '0' @@ -42,6 +45,7 @@ display: relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data display_plugin: default display_title: Master id: default diff --git a/core/modules/forum/tests/modules/forum_test_views/test_views/views.view.test_forum_index.yml b/core/modules/forum/tests/modules/forum_test_views/test_views/views.view.test_forum_index.yml index bafdc5f..ac6dee6 100644 --- a/core/modules/forum/tests/modules/forum_test_views/test_views/views.view.test_forum_index.yml +++ b/core/modules/forum/tests/modules/forum_test_views/test_views/views.view.test_forum_index.yml @@ -29,6 +29,7 @@ display: table: forum_index field: nid id: nid + provider: views sticky: id: sticky table: forum_index @@ -82,6 +83,7 @@ display: type_custom_false: '' not: '0' plugin_id: boolean + provider: views comment_count: id: comment_count table: forum_index @@ -140,6 +142,7 @@ display: prefix: '' suffix: '' plugin_id: numeric + provider: views filters: { } sorts: { } label: test_forum_index diff --git a/core/modules/node/config/views.view.content.yml b/core/modules/node/config/views.view.content.yml index bebc2d3..dcd8e7f 100644 --- a/core/modules/node/config/views.view.content.yml +++ b/core/modules/node/config/views.view.content.yml @@ -108,6 +108,7 @@ display: empty_zero: '0' hide_alter_empty: '1' plugin_id: node_bulk_form + provider: node title: id: title table: node_field_data @@ -124,6 +125,7 @@ display: hide_alter_empty: '1' link_to_node: '1' plugin_id: node + provider: node type: id: type table: node_field_data @@ -141,6 +143,7 @@ display: link_to_node: '0' machine_name: '0' plugin_id: node_type + provider: node name: id: name table: users @@ -161,6 +164,7 @@ display: anonymous_text: '' format_username: '1' plugin_id: user_name + provider: user status: id: status table: node_field_data @@ -180,6 +184,7 @@ display: type_custom_false: '' not: '0' plugin_id: boolean + provider: views changed: id: changed table: node_field_data @@ -198,6 +203,7 @@ display: custom_date_format: '' timezone: '' plugin_id: date + provider: views edit_node: id: edit_node table: node @@ -206,6 +212,7 @@ display: exclude: '1' text: Edit plugin_id: node_link_edit + provider: node delete_node: id: delete_node table: node @@ -214,6 +221,7 @@ display: exclude: '1' text: Delete plugin_id: node_link_delete + provider: node translation_link: id: translation_link table: node @@ -242,6 +250,7 @@ display: translation_link: translation_link destination: '1' plugin_id: dropbutton + provider: views filters: status_extra: id: status_extra @@ -250,6 +259,7 @@ display: operator: '=' value: '' plugin_id: node_status + provider: node status: id: status table: node_field_data @@ -294,6 +304,7 @@ display: operator: '=' value: '0' plugin_id: boolean + provider: views type: id: type table: node_field_data @@ -315,6 +326,7 @@ display: authenticated: authenticated reduce: '0' plugin_id: bundle + provider: views langcode: id: langcode table: node @@ -332,6 +344,7 @@ display: authenticated: authenticated optional: '1' plugin_id: language + provider: language sorts: { } title: Content empty: @@ -342,6 +355,7 @@ display: empty: '1' content: 'No content available.' plugin_id: text_custom + provider: views arguments: { } relationships: uid: @@ -351,6 +365,7 @@ display: admin_label: author required: '1' plugin_id: standard + provider: views show_admin_links: '0' display_plugin: default display_title: Master diff --git a/core/modules/node/config/views.view.frontpage.yml b/core/modules/node/config/views.view.frontpage.yml index 9ef450f..806893a 100644 --- a/core/modules/node/config/views.view.frontpage.yml +++ b/core/modules/node/config/views.view.frontpage.yml @@ -26,6 +26,7 @@ display: table: views tokenize: '0' plugin_id: text + provider: views node_listing_empty: admin_label: '' empty: '1' @@ -36,6 +37,7 @@ display: relationship: none table: node plugin_id: node_listing_empty + provider: node title: id: title table: views @@ -47,6 +49,7 @@ display: empty: '1' title: 'Welcome to [site:name]' plugin_id: title + provider: views exposed_form: type: basic options: @@ -94,6 +97,7 @@ display: table: node_field_data value: '1' plugin_id: boolean + provider: views status: expose: operator: '0' @@ -103,6 +107,7 @@ display: table: node_field_data value: '1' plugin_id: boolean + provider: views pager: type: full options: @@ -152,6 +157,7 @@ display: relationship: none table: node_field_data plugin_id: boolean + provider: views created: field: created id: created @@ -165,6 +171,7 @@ display: expose: label: '' granularity: second + provider: views style: type: default options: diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_type.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_type.yml index 317ed91..e6382e4 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_type.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_type.yml @@ -10,6 +10,7 @@ display: field: type id: type table: node_field_data + provider: node display_plugin: default display_title: Master id: default diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_filter_node_uid_revision.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_filter_node_uid_revision.yml index f309a1b..2c0122b 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_filter_node_uid_revision.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_filter_node_uid_revision.yml @@ -17,6 +17,7 @@ display: table: node field: nid plugin_id: node + provider: node filter_groups: groups: 1: AND @@ -33,6 +34,7 @@ display: value: - '1' plugin_id: node_uid_revision + provider: node sorts: { } pager: type: full diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_bulk_form.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_bulk_form.yml index f5d998e..e0748bc 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_bulk_form.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_bulk_form.yml @@ -20,11 +20,13 @@ display: table: node field: node_bulk_form plugin_id: node_bulk_form + provider: node title: id: title table: node_field_data field: title plugin_id: node + provider: node sorts: nid: id: nid @@ -32,6 +34,7 @@ display: field: nid order: ASC plugin_id: standard + provider: views page_1: display_plugin: page id: page_1 diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_nid.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_nid.yml index 09c8eab..c4e06a3 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_nid.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_nid.yml @@ -11,29 +11,34 @@ display: field: nid required: true plugin_id: standard + provider: views fields: vid: id: vid table: node_field_revision field: vid plugin_id: standard + provider: views nid_1: id: nid_1 table: node_field_revision field: nid plugin_id: standard + provider: views nid: id: nid table: node field: nid relationship: nid plugin_id: node + provider: node arguments: nid: id: nid table: node_field_revision field: nid plugin_id: node_nid + provider: node display_plugin: default display_title: Master id: default diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_vid.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_vid.yml index 553bfd2..38664e1 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_vid.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_vid.yml @@ -11,29 +11,34 @@ display: field: vid required: true plugin_id: standard + provider: views fields: vid: id: vid table: node_field_revision field: vid plugin_id: standard + provider: views nid_1: id: nid_1 table: node_field_revision field: nid plugin_id: standard + provider: views nid: id: nid table: node field: nid relationship: vid plugin_id: node + provider: node arguments: nid: id: nid table: node_field_revision field: nid plugin_id: node_nid + provider: node display_plugin: default display_title: Master id: default diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_row_plugin.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_row_plugin.yml index 814a7d1..e7bae25 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_row_plugin.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_row_plugin.yml @@ -22,6 +22,7 @@ display: table: node value: '1' plugin_id: boolean + provider: views pager: options: items_per_page: '10' diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_view.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_view.yml index e56c2d9..5b734dd 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_view.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_view.yml @@ -118,6 +118,7 @@ display: hide_alter_empty: '1' link_to_node: '0' plugin_id: node + provider: node filters: status: value: '1' @@ -127,6 +128,7 @@ display: expose: operator: '0' group: '1' + provider: views sorts: created: id: created @@ -140,6 +142,7 @@ display: expose: label: '' granularity: second + provider: views title: test_node_view header: { } footer: { } @@ -187,6 +190,7 @@ display: transform_dash: '0' break_phrase: '0' plugin_id: node_type + provider: node label: test_node_view module: views id: test_node_view diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_status_extra.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_status_extra.yml index 094f8d4..1944f59 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_status_extra.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_status_extra.yml @@ -76,6 +76,7 @@ display: hide_alter_empty: '1' link_to_node: '0' plugin_id: node + provider: node filters: status_extra: id: status_extra @@ -113,6 +114,7 @@ display: default_group_multiple: { } group_items: { } plugin_id: node_status + provider: node sorts: nid: id: nid @@ -120,17 +122,18 @@ display: field: nid order: ASC plugin_id: standard + provider: views filter_groups: operator: AND groups: 1: AND page_1: - display_options: - path: test_status_extra - display_plugin: page - display_title: Page - id: page_1 - position: '0' + display_options: + path: test_status_extra + display_plugin: page + display_title: Page + id: page_1 + position: '0' base_field: nid status: '1' module: views diff --git a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_entity.yml b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_entity.yml index 89fc66d..13d90aa 100644 --- a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_entity.yml +++ b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_entity.yml @@ -32,6 +32,7 @@ display: field: id order: DESC plugin_id: date + provider: views title: 'Test serialize' arguments: { } rest_export_1: diff --git a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_field.yml b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_field.yml index 1149476..029c34a 100644 --- a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_field.yml +++ b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_field.yml @@ -32,6 +32,7 @@ display: field: name label: '' plugin_id: string + provider: views_test_data nothing: id: nothing table: views @@ -45,11 +46,13 @@ display: alter_text: '1' text: TEST plugin_id: custom + provider: views created: id: created table: views_test_data field: created plugin_id: date + provider: views_test_data sorts: created: id: created @@ -57,6 +60,7 @@ display: field: created order: DESC plugin_id: date + provider: views_test_data title: 'Test serialize' arguments: { } rest_export_1: diff --git a/core/modules/statistics/tests/modules/statistics_test_views/test_views/views.view.test_statistics_integration.yml b/core/modules/statistics/tests/modules/statistics_test_views/test_views/views.view.test_statistics_integration.yml index dc3c7a9..798357e 100644 --- a/core/modules/statistics/tests/modules/statistics_test_views/test_views/views.view.test_statistics_integration.yml +++ b/core/modules/statistics/tests/modules/statistics_test_views/test_views/views.view.test_statistics_integration.yml @@ -45,6 +45,7 @@ display: hide_empty: '0' empty_zero: '0' link_to_node: '1' + provider: node timestamp: id: timestamp table: node_counter @@ -96,6 +97,7 @@ display: date_format: html_year custom_date_format: '' timezone: '' + provider: views totalcount: id: totalcount table: node_counter @@ -153,6 +155,7 @@ display: format_plural_plural: '@count' prefix: '' suffix: '' + provider: views daycount: id: daycount table: node_counter @@ -210,6 +213,7 @@ display: format_plural_plural: '@count' prefix: '' suffix: '' + provider: views filters: status: value: '1' @@ -219,12 +223,14 @@ display: expose: operator: '0' group: '1' + provider: views sorts: created: id: created table: node_field_data field: created order: DESC + provider: views page_1: display_plugin: page id: page_1 diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_groupwise_term.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_groupwise_term.yml index 4c4af55..957f2b2 100644 --- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_groupwise_term.yml +++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_groupwise_term.yml @@ -18,12 +18,14 @@ display: id: name table: taxonomy_term_data plugin_id: taxonomy + provider: taxonomy nid: field: nid id: nid relationship: tid_representative table: node plugin_id: node + provider: node pager: options: items_per_page: '10' @@ -46,6 +48,7 @@ display: subquery_view: '' table: taxonomy_term_data plugin_id: groupwise_max + provider: views row: type: fields sorts: @@ -55,6 +58,7 @@ display: order: DESC table: taxonomy_term_data plugin_id: standard + provider: views style: type: default title: test_groupwise diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_node_term_data.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_node_term_data.yml index b347dbd..2aebe47 100644 --- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_node_term_data.yml +++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_node_term_data.yml @@ -20,6 +20,7 @@ display: items_per_page: '25' table: taxonomy_term_data plugin_id: taxonomy + provider: taxonomy tid_1: default_argument_type: fixed field: tid @@ -32,6 +33,7 @@ display: items_per_page: '25' table: taxonomy_term_data plugin_id: taxonomy + provider: taxonomy cache: type: none exposed_form: @@ -49,6 +51,7 @@ display: vocabularies: tags: '0' plugin_id: node_term_data + provider: taxonomy term_node_tid_1: field: term_node_tid id: term_node_tid_1 @@ -57,12 +60,15 @@ display: vocabularies: tags: '0' plugin_id: node_term_data + provider: taxonomy sorts: nid: field: nid id: nid order: DESC table: nid + plugin_id: standard + provider: views style: type: default row: diff --git a/core/modules/tracker/tests/modules/tracker_test_views/test_views/views.view.test_tracker_user_uid.yml b/core/modules/tracker/tests/modules/tracker_test_views/test_views/views.view.test_tracker_user_uid.yml index fec4c92..a5b5184 100644 --- a/core/modules/tracker/tests/modules/tracker_test_views/test_views/views.view.test_tracker_user_uid.yml +++ b/core/modules/tracker/tests/modules/tracker_test_views/test_views/views.view.test_tracker_user_uid.yml @@ -94,6 +94,7 @@ display: empty_zero: '0' hide_alter_empty: '1' link_to_node: '1' + provider: node filters: uid_touch_tracker: id: uid_touch_tracker @@ -135,6 +136,7 @@ display: default_group_multiple: { } group_items: { } plugin_id: tracker_user_uid + provider: tracker arguments: uid_touch_tracker: id: uid_touch_tracker @@ -171,6 +173,7 @@ display: fail: 'not found' validate_options: { } plugin_id: tracker_user_uid + provider: tracker label: 'tracker test' module: views id: test_tracker_user_uid diff --git a/core/modules/user/config/views.view.user_admin_people.yml b/core/modules/user/config/views.view.user_admin_people.yml index 6a08227..ad49d68 100644 --- a/core/modules/user/config/views.view.user_admin_people.yml +++ b/core/modules/user/config/views.view.user_admin_people.yml @@ -187,6 +187,7 @@ display: empty_zero: '0' hide_alter_empty: '1' plugin_id: user_bulk_form + provider: user name: id: name table: users @@ -240,6 +241,7 @@ display: anonymous_text: '' format_username: '1' plugin_id: user_name + provider: user status: id: status table: users @@ -293,6 +295,7 @@ display: type_custom_false: '' not: '0' plugin_id: boolean + provider: views rid: id: rid table: users_roles @@ -344,6 +347,7 @@ display: type: ul separator: ', ' plugin_id: user_roles + provider: user created: id: created table: users @@ -396,6 +400,7 @@ display: custom_date_format: '' timezone: '' plugin_id: date + provider: views access: id: access table: users @@ -448,6 +453,7 @@ display: custom_date_format: '' timezone: '' plugin_id: date + provider: views edit_node: id: edit_node table: users @@ -498,6 +504,7 @@ display: hide_alter_empty: '1' text: Edit plugin_id: user_link_edit + provider: user translation_link: id: translation_link table: users @@ -740,6 +747,7 @@ display: group_items: { } reduce_duplicates: '0' plugin_id: user_roles + provider: user permission: id: permission table: users_roles @@ -780,6 +788,7 @@ display: group_items: { } reduce_duplicates: '0' plugin_id: user_permissions + provider: user status: id: status table: users @@ -818,6 +827,7 @@ display: default_group_multiple: { } group_items: { } plugin_id: boolean + provider: views uid_raw: id: uid_raw table: users @@ -857,6 +867,7 @@ display: default_group_multiple: { } group_items: { } plugin_id: numeric + provider: views sorts: created: id: created @@ -871,6 +882,7 @@ display: label: '' granularity: second plugin_id: date + provider: views title: People empty: area_text_custom: @@ -884,6 +896,7 @@ display: tokenize: '0' content: 'No people available.' plugin_id: text_custom + provider: views use_more: '0' use_more_always: '0' use_more_text: more diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/UserData.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/UserData.php index fe3c6e6..2e9a216 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/field/UserData.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/UserData.php @@ -46,8 +46,8 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o protected function defineOptions() { $options = parent::defineOptions(); - $options['module'] = array('default' => ''); - $options['name'] = array('default' => ''); + $options['data_module'] = array('default' => ''); + $options['data_name'] = array('default' => ''); return $options; } @@ -58,19 +58,19 @@ protected function defineOptions() { public function buildOptionsForm(&$form, &$form_state) { parent::buildOptionsForm($form, $form_state); - $form['module'] = array( + $form['data_module'] = array( '#title' => t('Module name'), '#type' => 'select', '#description' => t('The module which sets this user data.'), - '#default_value' => $this->options['module'], + '#default_value' => $this->options['data_module'], '#options' => system_get_module_info('name'), ); - $form['name'] = array( + $form['data_name'] = array( '#title' => t('Name'), '#type' => 'textfield', '#description' => t('The name of the data key.'), - '#default_value' => $this->options['name'], + '#default_value' => $this->options['data_name'], ); } @@ -79,7 +79,7 @@ public function buildOptionsForm(&$form, &$form_state) { */ function render($values) { $uid = $this->getValue($values); - $data = $this->userData->get($this->options['module'], $uid, $this->options['name']); + $data = $this->userData->get($this->options['data_module'], $uid, $this->options['data_name']); // Don't sanitize if no value was found. if (isset($data)) { diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/UserDataTest.php b/core/modules/user/lib/Drupal/user/Tests/Views/UserDataTest.php index ca871a6..6c27bf9 100644 --- a/core/modules/user/lib/Drupal/user/Tests/Views/UserDataTest.php +++ b/core/modules/user/lib/Drupal/user/Tests/Views/UserDataTest.php @@ -51,7 +51,7 @@ public function testDataField() { $output = $view->field['data']->render($view->result[0]); $this->assertEqual($output, $random_value, 'A valid user data got rendered.'); - $view->field['data']->options['name'] = $this->randomName(); + $view->field['data']->options['data_name'] = $this->randomName(); $output = $view->field['data']->render($view->result[0]); $this->assertFalse($output, 'An invalid configuration does not return anything'); diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_groupwise_user.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_groupwise_user.yml index b3b5b01..b0a6665 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_groupwise_user.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_groupwise_user.yml @@ -19,12 +19,14 @@ display: id: name table: users plugin_id: user_name + provider: user nid: field: nid id: nid relationship: uid_representative table: node plugin_id: node + provider: node filters: status: expose: @@ -35,6 +37,7 @@ display: table: users value: '1' plugin_id: boolean + provider: views pager: options: items_per_page: '10' @@ -57,6 +60,7 @@ display: subquery_view: '' table: users plugin_id: groupwise_max + provider: views row: type: fields sorts: @@ -66,6 +70,7 @@ display: order: DESC table: users plugin_id: date + provider: views style: type: default title: test_groupwise_user diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml index 8af545e..dede313 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml @@ -16,6 +16,7 @@ display: must_not_be: '0' style_plugin: default_summary table: views + provider: views cache: type: none exposed_form: @@ -36,6 +37,7 @@ display: id: title link_to_node: '0' table: node_field_data + provider: node pager: options: id: '0' diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_bulk_form.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_bulk_form.yml index ca11a38..d6c7538 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_bulk_form.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_bulk_form.yml @@ -20,11 +20,13 @@ display: table: users field: user_bulk_form plugin_id: user_bulk_form + provider: user name: id: name table: users field: name plugin_id: user_name + provider: user sorts: uid: id: uid @@ -32,6 +34,7 @@ display: field: uid order: ASC plugin_id: user + provider: views filters: status: id: status @@ -40,6 +43,7 @@ display: operator: '=' value: '1' plugin_id: boolean + provider: views page_1: display_plugin: page id: page_1 diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_data.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_data.yml index fff9da8..725724d 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_data.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_data.yml @@ -45,6 +45,7 @@ display: link_to_user: '1' overwrite_anonymous: '0' plugin_id: string + provider: views data: id: data table: users @@ -93,8 +94,8 @@ display: hide_empty: '0' empty_zero: '0' hide_alter_empty: '1' - module: views_test_config - name: test_value_name + data_module: views_test_config + data_name: test_value_name plugin_id: user_data filters: uid: @@ -107,6 +108,7 @@ display: operator: '0' group: '1' plugin_id: numeric + provider: user sorts: created: id: created @@ -114,6 +116,7 @@ display: field: created order: DESC plugin_id: date + provider: views label: test_user_data module: views id: test_user_data diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_name.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_name.yml index 23de1a0..0d2985c 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_name.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_name.yml @@ -22,6 +22,7 @@ display: id: uid table: users field: uid + provider: user filters: uid: id: uid @@ -36,6 +37,7 @@ display: remember_roles: authenticated: authenticated anonymous: 0 + provider: user display_plugin: default display_title: Master id: default diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_relationship.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_relationship.yml index 5a5f283..ff0c37b 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_relationship.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_relationship.yml @@ -37,6 +37,7 @@ display: overwrite_anonymous: '0' table: users plugin_id: user_name + provider: user title: alter: absolute: '0' @@ -55,6 +56,7 @@ display: link_to_node: '1' table: node_field_data plugin_id: node + provider: node uid: alter: absolute: '0' @@ -79,6 +81,7 @@ display: link_to_user: '1' table: users plugin_id: user + provider: user pager: options: items_per_page: '10' diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_uid_argument.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_uid_argument.yml index cdb3ca9..66f162e 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_uid_argument.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_uid_argument.yml @@ -11,17 +11,19 @@ display: table: users field: uid plugin_id: user + provider: user arguments: uid: id: uid table: users field: uid title_enable: true - title: %1 + title: '%1' plugin_id: user_uid + provider: user display_plugin: default display_title: Master id: default position: '0' -label: +label: null id: test_user_uid_argument diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_user.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_user.yml index 9121abb..eb11808 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_user.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_user.yml @@ -18,6 +18,7 @@ display: validate: type: user plugin_id: 'null' + provider: views cache: type: none exposed_form: diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_role.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_role.yml index df95c2d..3e333a9 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_role.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_role.yml @@ -81,6 +81,7 @@ display: anonymous_text: '' format_username: '1' plugin_id: user_name + provider: user rid: id: rid table: users_roles @@ -132,6 +133,7 @@ display: type: separator separator: '' plugin_id: user_roles + provider: user filters: status: value: '1' @@ -142,6 +144,7 @@ display: operator: '0' group: '1' plugin_id: boolean + provider: views sorts: { } title: test_user_role page_1: diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml index 0274bea..c68cde3 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml @@ -31,6 +31,7 @@ display: overwrite_anonymous: '0' table: users plugin_id: user_name + provider: user pager: type: full query: diff --git a/core/modules/views/config/views.view.archive.yml b/core/modules/views/config/views.view.archive.yml index cfd12cf..fa9b7a3 100644 --- a/core/modules/views/config/views.view.archive.yml +++ b/core/modules/views/config/views.view.archive.yml @@ -67,6 +67,7 @@ display: expose: label: '' granularity: second + provider: views arguments: created_year_month: id: created_year_month @@ -86,6 +87,7 @@ display: items_per_page: '30' specify_validation: '1' plugin_id: date_year_month + provider: views filters: status: id: status @@ -96,6 +98,7 @@ display: expose: operator: '0' plugin_id: boolean + provider: views style: type: default options: @@ -153,6 +156,7 @@ display: items_per_page: '30' specify_validation: '1' plugin_id: date_year_month + provider: views label: Archive module: node id: archive diff --git a/core/modules/views/config/views.view.backlinks.yml b/core/modules/views/config/views.view.backlinks.yml index 38c125b..ec0bb3d 100644 --- a/core/modules/views/config/views.view.backlinks.yml +++ b/core/modules/views/config/views.view.backlinks.yml @@ -65,6 +65,7 @@ display: group_type: group admin_label: '' tokenize: '0' + provider: views fields: title: id: title @@ -116,6 +117,7 @@ display: hide_empty: '0' empty_zero: '0' hide_alter_empty: '1' + provider: node arguments: nid: id: nid @@ -130,6 +132,8 @@ display: specify_validation: '1' validate: type: node + plugin_id: node_nid + provider: node filters: status: id: status @@ -140,6 +144,7 @@ display: expose: operator: '0' plugin_id: boolean + provider: views style: type: html_list options: @@ -207,6 +212,8 @@ display: specify_validation: '1' validate: type: node + plugin_type: node_nid + provider: node style: type: html_list row: diff --git a/core/modules/views/config/views.view.comments_recent.yml b/core/modules/views/config/views.view.comments_recent.yml index 9a3ce2b..378170d 100644 --- a/core/modules/views/config/views.view.comments_recent.yml +++ b/core/modules/views/config/views.view.comments_recent.yml @@ -51,6 +51,7 @@ display: group_type: group admin_label: Content required: '0' + provider: views fields: subject: id: subject @@ -103,6 +104,7 @@ display: empty_zero: '0' hide_alter_empty: '1' link_to_node: '0' + provider: comment timestamp: id: timestamp table: comment @@ -155,6 +157,7 @@ display: hide_alter_empty: '1' custom_date_format: '' timezone: '' + provider: views sorts: changed: id: changed @@ -169,6 +172,7 @@ display: expose: label: '' granularity: second + provider: views filters: status_extra: id: status_extra @@ -177,6 +181,7 @@ display: relationship: nid group: '0' plugin_id: node_status + provider: node style: type: html_list options: @@ -265,6 +270,7 @@ display: hide_empty: '0' empty_zero: '0' hide_alter_empty: '1' + provider: node timestamp: id: timestamp table: comment @@ -317,6 +323,7 @@ display: hide_alter_empty: '1' custom_date_format: '' timezone: '' + provider: views subject: id: subject table: comment @@ -368,6 +375,7 @@ display: empty_zero: '0' hide_alter_empty: '1' link_to_node: '0' + provider: comment comment: id: comment table: field_data_comment_body @@ -430,6 +438,7 @@ display: multi_type: separator separator: ', ' field_api_classes: '0' + provider: field path: comments/recent style: type: html_list diff --git a/core/modules/views/config/views.view.glossary.yml b/core/modules/views/config/views.view.glossary.yml index 23e095c..e5d3118 100644 --- a/core/modules/views/config/views.view.glossary.yml +++ b/core/modules/views/config/views.view.glossary.yml @@ -104,6 +104,7 @@ display: hide_empty: '0' empty_zero: '0' hide_alter_empty: '1' + provider: node name: id: name table: users @@ -157,6 +158,7 @@ display: overwrite_anonymous: '0' anonymous_text: '' format_username: '1' + provider: user changed: id: changed table: node_field_data @@ -209,6 +211,7 @@ display: hide_alter_empty: '1' custom_date_format: '' timezone: '' + provider: views arguments: title: id: title @@ -243,6 +246,7 @@ display: fail: 'not found' validate_options: { } break_phrase: '0' + provider: views relationships: uid: id: uid @@ -253,6 +257,7 @@ display: group_type: group admin_label: author required: '0' + provider: views style: type: table options: @@ -359,6 +364,7 @@ display: fail: 'not found' validate_options: { } break_phrase: '0' + provider: views displays: default: default page_1: page_1 diff --git a/core/modules/views/config/views.view.taxonomy_term.yml b/core/modules/views/config/views.view.taxonomy_term.yml index 7dda43d..e09771c 100644 --- a/core/modules/views/config/views.view.taxonomy_term.yml +++ b/core/modules/views/config/views.view.taxonomy_term.yml @@ -65,6 +65,7 @@ display: exposed: '0' expose: label: '' + provider: views created: id: created table: node_field_data @@ -78,6 +79,7 @@ display: expose: label: '' granularity: second + provider: views arguments: term_node_tid_depth: id: term_node_tid_depth @@ -108,6 +110,7 @@ display: validate_options: { } set_breadcrumb: '0' use_taxonomy_term_path: '0' + provider: taxonomy term_node_tid_depth_modifier: id: term_node_tid_depth_modifier table: node @@ -134,6 +137,7 @@ display: type: none fail: 'not found' validate_options: { } + provider: taxonomy filters: status_extra: id: status_extra @@ -143,6 +147,7 @@ display: expose: operator: '0' plugin_id: node_status + provider: node style: type: default options: diff --git a/core/modules/views/config/views.view.tracker.yml b/core/modules/views/config/views.view.tracker.yml index fa81fff..178421f 100644 --- a/core/modules/views/config/views.view.tracker.yml +++ b/core/modules/views/config/views.view.tracker.yml @@ -63,6 +63,7 @@ display: group_type: group admin_label: author required: '0' + provider: views fields: type: id: type @@ -115,6 +116,7 @@ display: hide_alter_empty: '1' link_to_node: '0' machine_name: '0' + provider: node title: id: title table: node_field_data @@ -165,6 +167,7 @@ display: empty_zero: '0' hide_alter_empty: '1' link_to_node: '1' + provider: node name: id: name table: users @@ -218,6 +221,7 @@ display: overwrite_anonymous: '0' anonymous_text: '' format_username: '1' + provider: user comment_count: id: comment_count table: node_comment_statistics @@ -276,6 +280,7 @@ display: format_plural_plural: '@count' prefix: '' suffix: '' + provider: views last_comment_timestamp: id: last_comment_timestamp table: node_comment_statistics @@ -328,6 +333,7 @@ display: date_format: small custom_date_format: '' timezone: '' + provider: comment timestamp: id: timestamp table: history @@ -379,6 +385,7 @@ display: hide_empty: '0' empty_zero: '0' hide_alter_empty: '1' + provider: history new_comments: id: new_comments table: node @@ -438,6 +445,7 @@ display: format_plural_singular: '1' format_plural_plural: '@count' prefix: '' + provider: comment sorts: last_comment_timestamp: id: last_comment_timestamp @@ -452,6 +460,7 @@ display: expose: label: '' granularity: second + provider: views arguments: uid_touch: id: uid_touch @@ -479,6 +488,7 @@ display: type: none fail: 'not found' validate_options: { } + provider: comment filters: status: id: status @@ -489,6 +499,7 @@ display: expose: operator: '0' plugin_id: boolean + provider: views style: type: table options: diff --git a/core/modules/views/lib/Drupal/views/Plugin/Discovery/ViewsHandlerDiscovery.php b/core/modules/views/lib/Drupal/views/Plugin/Discovery/ViewsHandlerDiscovery.php index 51664cb..460ef5a 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/Discovery/ViewsHandlerDiscovery.php +++ b/core/modules/views/lib/Drupal/views/Plugin/Discovery/ViewsHandlerDiscovery.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\Discovery; -use Drupal\Component\Plugin\Discovery\AnnotatedClassDiscovery; +use Drupal\Core\Plugin\Discovery\AnnotatedClassDiscovery; /** * Defines a discovery mechanism to find Views handlers in PSR-0 namespaces. @@ -48,7 +48,10 @@ function __construct($type, \Traversable $root_namespaces) { foreach ($root_namespaces as $namespace => $dir) { $plugin_namespaces["$namespace\\Plugin\\views\\{$type}"] = array($dir); } - parent::__construct($plugin_namespaces, $annotation_namespaces, 'Drupal\Component\Annotation\PluginID'); + + $this->pluginNamespaces = $plugin_namespaces; + $this->annotationNamespaces = $annotation_namespaces; + $this->pluginDefinitionAnnotationName = 'Drupal\Component\Annotation\PluginID'; } /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php index cd56c28..4be9226 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php @@ -763,21 +763,28 @@ protected function defaultDisplayOptions() { // choose the first field with a field handler. $data = Views::viewsData()->get($this->base_table); if (isset($data['table']['base']['defaults']['field'])) { - $field = $data['table']['base']['defaults']['field']; + $default_field = $data['table']['base']['defaults']['field']; } else { - foreach ($data as $field => $field_data) { + foreach ($data as $default_field => $field_data) { if (isset($field_data['field']['id'])) { break; } } } - $display_options['fields'][$field] = array( + $display_options['fields'][$default_field] = array( 'table' => $this->base_table, - 'field' => $field, - 'id' => $field, + 'field' => $default_field, + 'id' => $default_field, ); + // Load the plugin ID and module. + $base_field = $data['table']['base']['field']; + $display_options['fields'][$base_field]['plugin_id'] = $data[$base_field]['field']['id']; + if ($definition = Views::pluginManager('field')->getDefinition($display_options['fields'][$base_field]['plugin_id'])) { + $display_options['fields'][$base_field]['provider'] = isset($definition['module']) ? $definition['provider'] : 'views'; + } + return $display_options; } diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php b/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php index e11cc86..1cfd62a 100644 --- a/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php @@ -286,6 +286,7 @@ protected function displayMethodTests() { 'table' => 'views_test_data', 'field' => 'id', 'plugin_id' => 'numeric', + 'provider' => 'views', ); $this->assertEqual($item1, $expected_item); @@ -301,6 +302,7 @@ protected function displayMethodTests() { 'table' => 'views_test_data', 'field' => 'name', 'plugin_id' => 'standard', + 'provider' => 'views', ) + $options; $this->assertEqual($item2, $expected_item); diff --git a/core/modules/views/lib/Drupal/views/ViewExecutable.php b/core/modules/views/lib/Drupal/views/ViewExecutable.php index 84af7bb..a08793d 100644 --- a/core/modules/views/lib/Drupal/views/ViewExecutable.php +++ b/core/modules/views/lib/Drupal/views/ViewExecutable.php @@ -1908,6 +1908,9 @@ public function addItem($display_id, $type, $table, $field, $options = array(), $data = Views::viewsData()->get($table); if (isset($data[$field][$handler_type]['id'])) { $fields[$id]['plugin_id'] = $data[$field][$handler_type]['id']; + if ($definition = Views::pluginManager($handler_type)->getDefinition($fields[$id]['plugin_id'])) { + $fields[$id]['provider'] = isset($definition['provider']) ? $definition['provider'] : 'views'; + } } $this->displayHandlers->get($display_id)->setOption($types[$type]['plural'], $fields); diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_aggregate_count.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_aggregate_count.yml index 686a550..5f7c897 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_aggregate_count.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_aggregate_count.yml @@ -17,6 +17,7 @@ display: format: default_summary table: entity_test plugin_id: string + provider: views cache: type: none exposed_form: @@ -38,6 +39,7 @@ display: link_to_node: '0' table: entity_test plugin_id: numeric + provider: views group_by: '1' pager: type: some diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_alias.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_alias.yml index 7b31454..4baf989 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_alias.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_alias.yml @@ -32,6 +32,7 @@ display: overwrite_anonymous: '0' table: users plugin_id: user_name + provider: user filters: uid_raw: admin_label: '' @@ -72,6 +73,7 @@ display: min: '' value: '1' plugin_id: numeric + provider: views pager: type: full query: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_title.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_title.yml index de78efe..6da4540 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_title.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_title.yml @@ -17,6 +17,7 @@ display: relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data pager: options: offset: '0' @@ -30,6 +31,7 @@ display: relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data empty: title: field: title @@ -37,6 +39,7 @@ display: table: views plugin_id: title title: test_title_empty + provider: views display_plugin: default display_title: Master id: default @@ -53,8 +56,9 @@ display: table: views plugin_id: title title: test_title_header + provider: views display_plugin: page - display_title: Page 1 + display_title: 'Page 1' id: page_1 position: '1' label: '' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_date.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_date.yml index 5298384..726961e 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_date.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_date.yml @@ -16,6 +16,7 @@ display: id: date_fulldate table: views_test_data plugin_id: date_fulldate + provider: views_test_data fields: id: field: id @@ -23,6 +24,7 @@ display: relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data pager: options: offset: '0' @@ -36,6 +38,7 @@ display: relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data display_plugin: default display_title: Master id: default @@ -50,6 +53,7 @@ display: id: date_day table: views_test_data plugin_id: date_day + provider: views_test_data display_plugin: embed id: embed_1 embed_2: @@ -62,6 +66,7 @@ display: id: date_month table: views_test_data plugin_id: date_month + provider: views_test_data display_plugin: embed id: embed_2 embed_3: @@ -74,6 +79,7 @@ display: id: date_week table: views_test_data plugin_id: date_week + provider: views_test_data display_plugin: embed id: embed_3 embed_4: @@ -86,6 +92,7 @@ display: id: date_year table: views_test_data plugin_id: date_year + provider: views_test_data display_plugin: embed id: embed_4 embed_5: @@ -98,6 +105,7 @@ display: id: date_year_month table: views_test_data plugin_id: date_year_month + provider: views_test_data display_plugin: embed id: embed_5 label: '' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_current_user.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_current_user.yml index 1b8dff5..96b1974 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_current_user.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_current_user.yml @@ -14,6 +14,7 @@ display: id: uid table: node_field_data plugin_id: numeric + provider: views cache: type: none exposed_form: @@ -35,6 +36,7 @@ display: link_to_node: '0' table: node_field_data plugin_id: node + provider: node pager: options: id: '0' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_fixed.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_fixed.yml index f8a2500..d71ac66 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_fixed.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_fixed.yml @@ -17,6 +17,7 @@ display: style_plugin: default_summary table: views plugin_id: 'null' + provider: views cache: type: none exposed_form: @@ -38,6 +39,7 @@ display: link_to_node: '0' table: node_field_data plugin_id: node + provider: node pager: options: id: '0' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_attachment_ui.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_attachment_ui.yml index 61e4a7c..11ddd6c 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_attachment_ui.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_attachment_ui.yml @@ -25,6 +25,7 @@ display: table: views_test_data field: id plugin_id: numeric + provider: views_test_data display_plugin: default display_title: Master id: default @@ -45,7 +46,7 @@ display: display_plugin: feed id: feed_1 display_title: Feed - position: '' + position: '3' display_options: pager: type: some @@ -63,6 +64,5 @@ display: guid_field: id guid_field_is_permalink: '0' path: test_attachment_ui_feed - position: '3' id: test_attachment_ui tag: '' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_cache.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_cache.yml index 58fbd6e..7d10bc4 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_cache.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_cache.yml @@ -15,16 +15,19 @@ display: table: views_test_data field: id relationship: none + provider: views_test_data name: id: name table: views_test_data field: name relationship: none + provider: views_test_data age: id: age table: views_test_data field: age relationship: none + provider: views_test_data defaults: fields: '0' sorts: '0' @@ -35,6 +38,7 @@ display: table: views_test_data field: id relationship: none + provider: views_test_data label: '' id: test_cache tag: '' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_click_sort.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_click_sort.yml index f387260..2dfc632 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_click_sort.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_click_sort.yml @@ -11,16 +11,19 @@ display: table: views_test_data field: id plugin_id: numeric + provider: views_test_data name: id: name table: views_test_data field: name plugin_id: string + provider: views_test_data created: id: created table: views_test_data field: created plugin_id: date + provider: views_test_data display_options: access: type: none diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_destroy.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_destroy.yml index 772d5f1..a8fec7a 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_destroy.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_destroy.yml @@ -37,6 +37,7 @@ display: style_plugin: default_summary table: node_field_data plugin_id: date_day + provider: views created_fulldate: default_argument_type: fixed field: created_fulldate @@ -44,6 +45,7 @@ display: style_plugin: default_summary table: node_field_data plugin_id: date_fulldate + provider: views created_month: default_argument_type: fixed field: created_month @@ -51,6 +53,7 @@ display: style_plugin: default_summary table: node_field_data plugin_id: date_month + provider: views cache: type: none empty: @@ -60,12 +63,14 @@ display: id: area table: views plugin_id: text + provider: views area_1: empty: '0' field: area id: area_1 table: views plugin_id: text + provider: views exposed_form: type: basic fields: @@ -74,32 +79,38 @@ display: id: created table: node_field_data plugin_id: date + provider: views nid: field: nid id: nid table: node plugin_id: node + provider: node path: field: path id: path table: node plugin_id: node_path + provider: node filters: nid: field: nid id: nid table: node plugin_id: numeric + provider: views status: field: status id: status table: node_field_data plugin_id: boolean + provider: views title: field: title id: title table: node_field_data plugin_id: string + provider: views footer: area: empty: '0' @@ -107,12 +118,14 @@ display: id: area table: views plugin_id: text + provider: views area_1: empty: '0' field: area id: area_1 table: views plugin_id: text + provider: views header: area: empty: '0' @@ -120,12 +133,14 @@ display: id: area table: views plugin_id: text + provider: views area_1: empty: '0' field: area id: area_1 table: views plugin_id: text + provider: views pager: type: full query: @@ -136,29 +151,34 @@ display: id: cid table: node plugin_id: standard + provider: views pid: field: pid id: pid table: comment relationship: cid plugin_id: standard + provider: views uid: field: uid id: uid table: comment relationship: cid plugin_id: standard + provider: views sorts: last_comment_name: field: last_comment_name id: last_comment_name table: node_comment_statistics plugin_id: comment_ncs_last_comment_name + provider: comment last_comment_timestamp: field: last_comment_timestamp id: last_comment_timestamp table: node_comment_statistics plugin_id: date + provider: views style: type: default row: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml index d5fff8a..a223987 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml @@ -46,6 +46,7 @@ display: id: title table: node_field_data plugin_id: node + provider: node filters: status: field: status @@ -54,6 +55,7 @@ display: table: node_field_data value: '1' plugin_id: boolean + provider: views pager: options: items_per_page: '10' @@ -72,6 +74,7 @@ display: order: DESC table: node_field_data plugin_id: date + provider: views style_plugin: default title: 'Test Display' display_plugin: default diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_attachment.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_attachment.yml index 15e113d..7026ac1 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_attachment.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_attachment.yml @@ -44,6 +44,7 @@ display: hide_empty: '0' empty_zero: '0' link_to_node: '1' + provider: views_test_data title: test_display_attachment page_1: display_plugin: page diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_defaults.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_defaults.yml index e2f5288..11b33fa 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_defaults.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_defaults.yml @@ -36,12 +36,14 @@ display: id: name table: views_test_data field: name + provider: views_test_data sorts: created: id: created table: views_test_data field: created order: DESC + provider: views_test_data label: '' module: views id: test_display_defaults diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_invalid.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_invalid.yml index 5c0c76d..0ffe259 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_invalid.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_invalid.yml @@ -14,6 +14,7 @@ display: table: node field: nid plugin_id: numeric + provider: node display_plugin: default display_title: Master id: default diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_more.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_more.yml index 479d7a4..82d616d 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_more.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_more.yml @@ -17,6 +17,7 @@ display: relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data pager: options: offset: '0' @@ -30,6 +31,7 @@ display: relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data use_more: '1' use_more_always: '1' use_more_text: 'custom more text' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_dropbutton.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_dropbutton.yml index 536a3be..98d0d72 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_dropbutton.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_dropbutton.yml @@ -77,6 +77,7 @@ display: empty_zero: '0' hide_alter_empty: '1' link_to_node: '0' + provider: node title: id: title table: node_field_data @@ -95,6 +96,7 @@ display: hide_empty: '0' empty_zero: '0' link_to_node: '1' + provider: node nothing: id: nothing table: views @@ -144,6 +146,7 @@ display: hide_empty: '0' empty_zero: '0' hide_alter_empty: '0' + provider: views dropbutton: id: dropbutton table: views @@ -198,6 +201,7 @@ display: nothing: nothing nid: '0' destination: '1' + provider: views filters: status: value: '1' @@ -208,6 +212,7 @@ display: expose: operator: '0' group: '1' + provider: views sorts: created: id: created @@ -215,6 +220,7 @@ display: field: created order: DESC plugin_id: date + provider: views title: test_dropbutton page_1: display_plugin: page diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_area.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_area.yml index 4828f60..bb30663 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_area.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_area.yml @@ -18,14 +18,16 @@ display: entity_id: 1 view_mode: full plugin_id: entity + provider: views footer: entity_entity_test_render: field: entity_entity_test_render id: entity_entity_test_render table: views - entity_id: !1 + entity_id: '!1' view_mode: full plugin_id: entity + provider: views fields: id: field: id @@ -33,12 +35,14 @@ display: relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data arguments: id: id: id table: views_test_data field: id plugin_id: numeric + provider: views_test_data pager: options: offset: '0' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_type_filter.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_type_filter.yml index e624204..9babc1c 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_type_filter.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_type_filter.yml @@ -15,6 +15,7 @@ display: table: node field: nid relationship: none + provider: node type: id: type table: node_field_data @@ -63,6 +64,7 @@ display: hide_empty: '0' empty_zero: '0' hide_alter_empty: '1' + provider: node defaults: fields: '0' filters: '0' @@ -76,6 +78,7 @@ display: all: all test_bundle: test_bundle test_bundle_2: test_bundle_2 + provider: views label: '' id: test_entity_type_filter tag: '' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_example_area.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_example_area.yml index bad397b..2b94cc1 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_example_area.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_example_area.yml @@ -15,18 +15,21 @@ display: id: test_example table: views plugin_id: test_example + provider: views_test_data footer: test_example: field: test_example id: test_example table: views plugin_id: test_example + provider: views_test_data empty: test_example: field: test_example id: test_example table: views plugin_id: test_example + provider: views_test_data display_plugin: default display_title: Master id: default diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_admin_ui.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_admin_ui.yml index 51591b2..910d770 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_admin_ui.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_admin_ui.yml @@ -23,6 +23,7 @@ display: id: type table: node_field_data plugin_id: node_type + provider: views body_value: id: body_value table: field_data_body @@ -63,6 +64,7 @@ display: operator: empty value: '' plugin_id: string + provider: views pager: type: full sorts: @@ -71,6 +73,7 @@ display: id: created table: node_field_data plugin_id: date + provider: views style: type: default row: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_feed_display.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_feed_display.yml index e4ac83b..1c82fa3 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_feed_display.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_feed_display.yml @@ -30,6 +30,7 @@ display: link_to_node: '1' table: node_field_data plugin_id: node + provider: node filters: status: expose: @@ -40,6 +41,7 @@ display: table: node_field_data value: '1' plugin_id: boolean + provider: views pager: options: items_per_page: '10' @@ -59,6 +61,7 @@ display: order: DESC table: node_field_data plugin_id: date + provider: views style: type: default title: test_feed_display diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_classes.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_classes.yml index b917482..4f0a5e2 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_classes.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_classes.yml @@ -15,6 +15,7 @@ display: table: views_test_data field: id plugin_id: numeric + provider: views_test_data style: type: html_list display_plugin: default diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_get_entity.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_get_entity.yml index 0600e95..50c033c 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_get_entity.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_get_entity.yml @@ -17,18 +17,21 @@ display: id: cid table: comment plugin_id: comment + provider: comment nid: field: nid id: nid table: node relationship: nid plugin_id: node + provider: node uid: field: uid id: uid table: users relationship: uid plugin_id: user + provider: user filter_groups: groups: { } operator: AND @@ -44,6 +47,7 @@ display: required: '1' table: comment plugin_id: standard + provider: views uid: admin_label: '' field: uid @@ -54,6 +58,7 @@ display: required: '0' table: node_field_data plugin_id: standard + provider: views sorts: { } style: type: default diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_output.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_output.yml index bde1591..74f7e59 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_output.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_output.yml @@ -15,6 +15,7 @@ display: table: views_test_data field: name plugin_id: string + provider: views_test_data style: type: html_list display_plugin: default diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_tokens.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_tokens.yml index 9478d11..5bb6c56 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_tokens.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_tokens.yml @@ -21,21 +21,25 @@ display: table: views_test_data field: name plugin_id: string + provider: views_test_data name_1: id: name_1 table: views_test_data field: name plugin_id: string + provider: views_test_data name_2: id: name_2 table: views_test_data field: name plugin_id: string + provider: views_test_data job: id: job table: views_test_data field: job plugin_id: string + provider: views_test_data style: type: default row: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_type.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_type.yml index d3b4a0a..6113c52 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_type.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_type.yml @@ -11,6 +11,7 @@ display: id: type table: node_field_data plugin_id: node_type + provider: node display_plugin: default display_title: Master id: default diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter.yml index 8ff1901..cfd3c6f 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter.yml @@ -20,12 +20,14 @@ display: label: '' table: views_test_data plugin_id: string + provider: views_test_data filters: type: field: name id: test_filter table: views_test_data plugin_id: string + provider: views_test_data query: type: views_query use_more_always: '0' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_date_between.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_date_between.yml index 313a052..384dd7e 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_date_between.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_date_between.yml @@ -17,12 +17,14 @@ display: id: nid table: node plugin_id: node + provider: node filters: created: field: created id: created table: node_field_data plugin_id: date + provider: views pager: type: full query: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_group_override.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_group_override.yml index cd290d9..99356cd 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_group_override.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_group_override.yml @@ -21,6 +21,7 @@ display: label: '' table: node_field_data plugin_id: node + provider: node filters: status: expose: @@ -31,6 +32,7 @@ display: table: node_field_data value: '1' plugin_id: boolean + provider: views pager: type: full query: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_groups.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_groups.yml index cd9466f..0975e42 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_groups.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_groups.yml @@ -21,6 +21,7 @@ display: label: '' table: node_field_data plugin_id: node + provider: node filter_groups: groups: 1: AND @@ -34,6 +35,7 @@ display: value: value: '1' plugin_id: numeric + provider: views nid_1: field: nid group: '2' @@ -42,6 +44,7 @@ display: value: value: '2' plugin_id: numeric + provider: views status: expose: operator: '0' @@ -51,6 +54,7 @@ display: table: node_field_data value: '1' plugin_id: boolean + provider: views pager: options: items_per_page: '10' @@ -64,6 +68,7 @@ display: order: DESC table: node_field_data plugin_id: date + provider: views title: test_filter_groups style: type: default @@ -91,6 +96,7 @@ display: value: value: '1' plugin_id: numeric + provider: views nid_1: field: nid group: '2' @@ -99,6 +105,7 @@ display: value: value: '2' plugin_id: numeric + provider: views status: expose: operator: '0' @@ -108,6 +115,7 @@ display: table: node_field_data value: '1' plugin_id: boolean + provider: views path: test-filter-groups display_plugin: page display_title: Page diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_in_operator_ui.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_in_operator_ui.yml index abe6884..f10f25c 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_in_operator_ui.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_in_operator_ui.yml @@ -24,6 +24,7 @@ display: id: type table: node_field_data plugin_id: string + provider: views pager: type: full style: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_get_attach_displays.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_get_attach_displays.yml index 6fbccaf..94c777c 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_get_attach_displays.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_get_attach_displays.yml @@ -50,6 +50,7 @@ display: hide_empty: '0' empty_zero: '0' link_to_node: '1' + provider: node filters: status: value: '1' @@ -60,6 +61,7 @@ display: expose: operator: '0' group: '1' + provider: views sorts: created: id: created @@ -67,6 +69,7 @@ display: field: created order: DESC plugin_id: date + provider: views title: test_get_attach_displays page_1: display_plugin: page diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_glossary.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_glossary.yml index f8783ce..41875e8 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_glossary.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_glossary.yml @@ -21,6 +21,7 @@ display: items_per_page: '25' table: node_field_data plugin_id: string + provider: views cache: type: none exposed_form: @@ -32,6 +33,7 @@ display: label: '' table: node_field_data plugin_id: node + provider: node pager: type: full query: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_count.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_count.yml index f16877c..4bf96e3 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_count.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_count.yml @@ -28,6 +28,7 @@ display: id: id table: entity_test plugin_id: numeric + provider: views name: alter: alter_text: '0' @@ -43,6 +44,7 @@ display: id: name table: entity_test plugin_id: standard + provider: views group_by: '1' pager: type: some diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_in_filters.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_in_filters.yml index 671b656..46cdd57 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_in_filters.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_in_filters.yml @@ -27,6 +27,7 @@ display: id: name table: entity_test plugin_id: standard + provider: views filters: id: field: id @@ -37,6 +38,7 @@ display: value: value: '3' plugin_id: numeric + provider: views group_by: '1' pager: type: some diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_relationships.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_relationships.yml index bf45d7d..71d1e17 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_relationships.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_relationships.yml @@ -11,18 +11,21 @@ display: table: node_field_data field: title plugin_id: node + provider: node relationships: cid: id: cid table: node field: cid plugin_id: standard + provider: views nid: id: nid table: comment field: nid relationship: cid plugin_id: standard + provider: views display_plugin: default display_title: Master id: default diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_test_access.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_test_access.yml index 11f590a..2a1a649 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_test_access.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_test_access.yml @@ -9,44 +9,52 @@ display: table: views_test_data field: access_callback plugin_id: numeric + provider: views_test_data access_callback_arguments: id: access_callback_arguments table: views_test_data field: access_callback_arguments plugin_id: numeric + provider: views_test_data filters: access_callback: id: access_callback table: views_test_data field: access_callback plugin_id: numeric + provider: views_test_data access_callback_arguments: id: access_callback_arguments table: views_test_data field: access_callback_arguments plugin_id: numeric + provider: views_test_data arguments: access_callback: id: access_callback table: views_test_data field: access_callback plugin_id: numeric + provider: views_test_data access_callback_arguments: id: access_callback_arguments table: views_test_data field: access_callback_arguments plugin_id: numeric + provider: views_test_data sorts: access_callback: id: access_callback table: views_test_data field: access_callback plugin_id: standard + provider: views_test_data access_callback_arguments: id: access_callback_arguments table: views_test_data field: access_callback_arguments plugin_id: standard + provider: views_test_data display_plugin: default display_title: Master id: default diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_history.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_history.yml index aca6f52..f2791fc 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_history.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_history.yml @@ -43,6 +43,7 @@ display: hide_empty: '0' empty_zero: '0' link_to_node: '1' + provider: node timestamp: id: timestamp table: history @@ -94,6 +95,7 @@ display: hide_alter_empty: '1' link_to_node: '0' comments: '0' + provider: history filters: status: value: '1' @@ -104,6 +106,7 @@ display: expose: operator: '0' group: '1' + provider: views sorts: created: id: created @@ -111,6 +114,7 @@ display: field: created plugin_id: date order: DESC + provider: views page_1: display_plugin: page id: page_1 @@ -164,6 +168,7 @@ display: default_group: All default_group_multiple: { } group_items: { } + provider: views timestamp: id: timestamp table: history @@ -199,6 +204,7 @@ display: default_group: All default_group_multiple: { } group_items: { } + provider: history defaults: filters: '0' filter_groups: '0' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_mini_pager.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_mini_pager.yml index 9483274..4e59d17 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_mini_pager.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_mini_pager.yml @@ -28,8 +28,8 @@ display: id: '0' total_pages: '' tags: - previous: ‹‹ test - next: ›› test + previous: '‹‹ test' + next: '›› test' expose: items_per_page: '0' items_per_page_label: 'Items per page' @@ -65,6 +65,7 @@ display: empty_zero: '0' link_to_node: '1' plugin_id: node + provider: views filters: { } sorts: nid: @@ -73,6 +74,7 @@ display: field: nid plugin_id: standard order: ASC + provider: views title: test_mini_pager filter_groups: operator: AND diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display.yml index a293826..d090123 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display.yml @@ -17,6 +17,7 @@ display: relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data display_plugin: default display_title: Master id: default diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_arguments.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_arguments.yml index 51d8635..16402ec 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_arguments.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_arguments.yml @@ -17,6 +17,7 @@ display: field: id table: views_test_data plugin_id: numeric + provider: views_test_data display_plugin: default display_title: Master id: default @@ -39,6 +40,7 @@ display: relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data path: test_route_with_argument display_plugin: page display_title: Page @@ -55,6 +57,7 @@ display: relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data path: test_route_with_suffix/%/suffix display_plugin: page display_title: Page @@ -71,12 +74,14 @@ display: relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data id_2: field: id id: id_2 relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data path: test_route_with_suffix_and_argument/%/suffix display_plugin: page display_title: Page diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_menu.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_menu.yml index 7cdfd9e..687e1c2 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_menu.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_menu.yml @@ -17,6 +17,7 @@ display: table: views_test_data field: id plugin_id: numeric + provider: views_test_data display_plugin: default display_title: Master id: default diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_route.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_route.yml index 4db7fa3..a827e87 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_route.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_route.yml @@ -17,6 +17,7 @@ display: table: views_test_data field: id plugin_id: numeric + provider: views_test_data display_plugin: default display_title: Master id: default @@ -39,6 +40,7 @@ display: relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data path: test_route_with_argument display_plugin: page display_title: Page @@ -55,6 +57,7 @@ display: relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data path: test_route_with_argument/%/suffix display_plugin: page display_title: Page @@ -71,12 +74,14 @@ display: relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data id_2: field: id id: id_2 relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data path: test_route_with_argument/%/suffix display_plugin: page display_title: Page @@ -93,12 +98,14 @@ display: relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data id_2: field: id id: id_2 relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data path: test_route_with_argument display_plugin: page display_title: Page @@ -115,12 +122,14 @@ display: relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data id_2: field: id id: id_2 relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data path: test_route_with_argument/%/% display_plugin: page display_title: Page diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_view.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_view.yml index 6792507..39608d6 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_view.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_view.yml @@ -17,13 +17,14 @@ display: relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data display_plugin: default display_title: Master id: default position: '0' page_1: display_plugin: page - display_title: Test page view + display_title: 'Test page view' id: page_1 label: '' id: test_page_view diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_preview.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_preview.yml index e8b81f8..920ed7d 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_preview.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_preview.yml @@ -38,6 +38,7 @@ display: label: Name exclude: '0' plugin_id: standard + provider: views_test_data filters: id: id: id @@ -55,7 +56,7 @@ display: exposed: '1' expose: operator_id: id_op - label: 'ID' + label: ID description: '' use_operator: '0' operator: id_op @@ -65,6 +66,7 @@ display: multiple: '0' is_grouped: '0' plugin_id: numeric + provider: views_test_data sorts: { } filter_groups: operator: AND @@ -82,6 +84,7 @@ display: title_enable: '0' title: '' plugin_id: numeric + provider: views_test_data header: area_text_custom: id: area_text_custom @@ -94,6 +97,7 @@ display: content: 'Test header text' tokenize: '0' plugin_id: text_custom + provider: views footer: area_text_custom: id: area_text_custom @@ -106,6 +110,7 @@ display: content: 'Test footer text' tokenize: '0' plugin_id: text_custom + provider: views empty: area_text_custom: id: area_text_custom @@ -118,6 +123,7 @@ display: content: 'Test empty text' tokenize: '0' plugin_id: text_custom + provider: views label: test_preview module: views id: test_preview diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_redirect_view.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_redirect_view.yml index f86f3b2..12e38fa 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_redirect_view.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_redirect_view.yml @@ -50,6 +50,7 @@ display: empty_zero: '0' link_to_node: '1' plugin_id: node + provider: node filters: status: value: '1' @@ -60,6 +61,7 @@ display: operator: '0' group: '1' plugin_id: boolean + provider: views sorts: created: id: created @@ -67,6 +69,7 @@ display: field: created order: DESC plugin_id: date + provider: views title: test_redirect_view page_1: display_plugin: page diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_reset_button.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_reset_button.yml index 140a80d..76c6618 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_reset_button.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_reset_button.yml @@ -25,6 +25,7 @@ display: id: type table: node_field_data plugin_id: node_type + provider: views pager: type: full query: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_simple_argument.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_simple_argument.yml index 16cec76..1d4f884 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_simple_argument.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_simple_argument.yml @@ -17,16 +17,19 @@ display: id: age relationship: none table: views_test_data + provider: views_test_data id: field: id id: id relationship: none table: views_test_data + provider: views_test_data name: field: name id: name relationship: none table: views_test_data + provider: views_test_data pager: options: offset: '0' @@ -39,6 +42,7 @@ display: order: ASC relationship: none table: views_test_data + provider: views_test_data arguments: age: default_action: ignore @@ -76,6 +80,7 @@ display: validate_argument_transform: '0' validate_user_restrict_roles: '0' validate_argument_php: '' + provider: views_test_data display_plugin: default display_title: Master id: default diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_mapping.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_mapping.yml index 42d333a..9cac36f 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_mapping.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_mapping.yml @@ -17,18 +17,21 @@ display: relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data job: field: job id: job relationship: none table: views_test_data plugin_id: string + provider: views_test_data name: field: name id: name relationship: none table: views_test_data plugin_id: string + provider: views_test_data pager: options: offset: '0' @@ -42,6 +45,7 @@ display: relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data style: type: mapping_test options: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_table.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_table.yml index 991fbdf..8957262 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_table.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_table.yml @@ -17,18 +17,21 @@ display: relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data id: field: id id: id relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data name: field: name id: name relationship: none table: views_test_data plugin_id: string + provider: views_test_data pager: options: offset: '0' @@ -42,6 +45,7 @@ display: relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data style: type: table options: @@ -51,7 +55,7 @@ display: row_class_special: '1' override: '1' sticky: '0' - summary: '' + summary: summary-text columns: age: age id: id @@ -78,10 +82,9 @@ display: separator: '' empty_column: '0' responsive: '' - default: 'id' + default: id empty_table: '1' caption: caption-text - summary: summary-text description: description-text row: type: fields @@ -98,13 +101,14 @@ display: content: 'custom text' tokenize: '0' plugin_id: text_custom + provider: views display_plugin: default display_title: Master id: default position: '0' page_1: display_options: - path: 'test-table' + path: test-table display_plugin: page display_title: 'Page display' id: page_1 diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tokens.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tokens.yml index e405487..2867aa9 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tokens.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tokens.yml @@ -20,18 +20,21 @@ display: relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data id: field: id id: id relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data name: field: name id: name relationship: none table: views_test_data plugin_id: string + provider: views_test_data pager: type: full options: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view.yml index e660006..1f47740 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view.yml @@ -17,18 +17,21 @@ display: relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data id: field: id id: id relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data name: field: name id: name relationship: none table: views_test_data plugin_id: string + provider: views_test_data pager: options: offset: '0' @@ -42,6 +45,7 @@ display: relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data display_plugin: default display_title: Master id: default diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml index 192746d..2cb8d4f 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml @@ -18,6 +18,7 @@ display: validate: type: numeric plugin_id: 'null' + provider: views cache: type: none exposed_form: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_argument_validate_php.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_argument_validate_php.yml index 11dd632..de1e187 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_argument_validate_php.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_argument_validate_php.yml @@ -18,6 +18,7 @@ display: validate: type: php plugin_id: 'null' + provider: views cache: type: none exposed_form: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_empty.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_empty.yml index 7c83a7d..9504a9f 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_empty.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_empty.yml @@ -17,6 +17,7 @@ display: relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data pager: options: offset: '0' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_handler_weight.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_handler_weight.yml index acbe18e..e7b0d0a 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_handler_weight.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_handler_weight.yml @@ -17,18 +17,21 @@ display: relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data age: field: age id: age relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data name: field: name id: name relationship: none table: views_test_data plugin_id: string + provider: views_test_data pager: options: offset: '0' @@ -42,6 +45,7 @@ display: relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data age: field: age id: standard @@ -49,17 +53,20 @@ display: relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data filters: name: field: name id: string table: views_test_data plugin_id: string + provider: views_test_data age: field: age id: numeric table: views_test_data plugin_id: numeric + provider: views_test_data display_plugin: default display_title: Master id: default diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_pager_full_zero_items_per_page.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_pager_full_zero_items_per_page.yml index 968c40e..f563ed8 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_pager_full_zero_items_per_page.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_pager_full_zero_items_per_page.yml @@ -28,6 +28,7 @@ display: link_to_node: '0' table: node_field_data plugin_id: node + provider: node pager: options: id: '0' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_render.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_render.yml index 452ec07..320d835 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_render.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_render.yml @@ -17,18 +17,21 @@ display: relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data id: field: id id: id relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data name: field: name id: name relationship: none table: views_test_data plugin_id: string + provider: views_test_data pager: options: offset: '0' @@ -42,6 +45,7 @@ display: relationship: none table: views_test_data plugin_id: standard + provider: views_test_data style: type: table display_plugin: default diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_storage.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_storage.yml index 9d6a180..7a431c8 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_storage.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_storage.yml @@ -18,6 +18,7 @@ display: relationship: none table: views_test_data plugin_id: numeric + provider: views_test_data sorts: id: field: id @@ -26,6 +27,7 @@ display: relationship: none table: views_test_data plugin_id: standard + provider: views_test_data display_plugin: default display_title: Master id: default @@ -51,4 +53,4 @@ display: options: { } label: 'Storage Test View' id: test_view_storage -tag: 'test' +tag: test diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_views_groupby_save.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_views_groupby_save.yml index 4b9b853..e17bdf4 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_views_groupby_save.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_views_groupby_save.yml @@ -1,5 +1,4 @@ base_table: views_test_data -base_table: id core: '8' description: '' status: '1' @@ -24,6 +23,7 @@ display: table: views_test_data id: id plugin_id: id + provider: views_test_data display_plugin: default display_title: Master id: default -- 1.7.10.4