diff --git a/core/modules/views/config/views.view.archive.yml b/core/modules/views/config/views.view.archive.yml index f2b3a62..92ef356 100644 --- a/core/modules/views/config/views.view.archive.yml +++ b/core/modules/views/config/views.view.archive.yml @@ -33,6 +33,7 @@ display: table: node field: created order: DESC + module: views arguments: created_year_month: id: created_year_month @@ -51,6 +52,7 @@ display: override: true items_per_page: '30' specify_validation: 1 + module: node filters: status: id: status @@ -60,6 +62,7 @@ display: group: 0 expose: operator: false + module: views style: type: default row: @@ -101,3 +104,4 @@ display: summary_options: items_per_page: '30' specify_validation: 1 + module: node diff --git a/core/modules/views/config/views.view.backlinks.yml b/core/modules/views/config/views.view.backlinks.yml index 8c1f2a7..1f95606 100644 --- a/core/modules/views/config/views.view.backlinks.yml +++ b/core/modules/views/config/views.view.backlinks.yml @@ -36,6 +36,7 @@ display: empty: false content: 'No backlinks found.' format: '1' + module: views fields: title: id: title @@ -43,6 +44,7 @@ display: field: title label: '' link_to_node: 1 + module: node arguments: nid: id: nid @@ -57,6 +59,7 @@ display: specify_validation: 1 validate: type: node + module: search filters: status: id: status @@ -66,6 +69,7 @@ display: group: 0 expose: operator: false + module: views style: type: html_list options: @@ -117,6 +121,7 @@ display: specify_validation: 1 validate: type: node + module: search 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 6e86a0c..c02a305 100644 --- a/core/modules/views/config/views.view.comments_recent.yml +++ b/core/modules/views/config/views.view.comments_recent.yml @@ -35,6 +35,7 @@ display: id: nid table: comment field: nid + module: views fields: subject: id: subject @@ -42,18 +43,21 @@ display: field: subject label: '' link_to_comment: 1 + module: comment timestamp: id: timestamp table: comment field: changed label: '' date_format: 'time ago' + module: views sorts: timestamp: id: timestamp table: comment field: changed order: DESC + module: views filters: status_extra: id: status_extra @@ -61,6 +65,7 @@ display: field: status_extra relationship: nid group: 0 + module: node style: type: html_list row: @@ -88,23 +93,27 @@ display: relationship: nid label: 'Reply to' link_to_node: 1 + module: node timestamp: id: timestamp table: comment field: changed label: '' date_format: 'time ago' + module: views subject: id: subject table: comment field: subject label: '' link_to_comment: 1 + module: comment comment: id: comment table: field_data_comment_body field: comment_body label: '' + module: field path: comments/recent style: type: html_list diff --git a/core/modules/views/config/views.view.frontpage.yml b/core/modules/views/config/views.view.frontpage.yml index a635a0e..33a1116 100644 --- a/core/modules/views/config/views.view.frontpage.yml +++ b/core/modules/views/config/views.view.frontpage.yml @@ -38,11 +38,13 @@ display: table: node field: sticky order: DESC + module: views created: id: created table: node field: created order: DESC + module: views filters: promote: id: promote @@ -52,6 +54,7 @@ display: group: 0 expose: operator: false + module: views status: id: status table: node @@ -60,6 +63,7 @@ display: group: 0 expose: operator: false + module: views page_1: id: page_1 display_title: Page diff --git a/core/modules/views/config/views.view.glossary.yml b/core/modules/views/config/views.view.glossary.yml index 966da7c..cceb429 100644 --- a/core/modules/views/config/views.view.glossary.yml +++ b/core/modules/views/config/views.view.glossary.yml @@ -35,6 +35,7 @@ display: table: node field: title link_to_node: 1 + module: node name: id: name table: users @@ -42,12 +43,14 @@ display: label: Author link_to_user: 1 relationship: uid + module: user changed: id: changed table: node field: changed label: 'Last update' date_format: large + module: views arguments: title: id: title @@ -67,11 +70,13 @@ display: case: upper path_case: lower transform_dash: 0 + module: views relationships: uid: id: uid table: node field: uid + module: views style: type: table options: @@ -144,6 +149,7 @@ display: case: upper path_case: lower transform_dash: 0 + module: views displays: default: default page: 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 742c5d7..4a533ca 100644 --- a/core/modules/views/config/views.view.taxonomy_term.yml +++ b/core/modules/views/config/views.view.taxonomy_term.yml @@ -32,11 +32,13 @@ display: table: node field: sticky order: DESC + module: views created: id: created table: node field: created order: DESC + module: views arguments: term_node_tid_depth: id: term_node_tid_depth @@ -55,6 +57,7 @@ display: type: taxonomy_term depth: '0' break_phrase: 1 + module: taxonomy term_node_tid_depth_modifier: id: term_node_tid_depth_modifier table: node @@ -65,6 +68,7 @@ display: summary: format: default_summary specify_validation: 1 + module: taxonomy filters: status_extra: id: status_extra @@ -73,6 +77,7 @@ display: group: 0 expose: operator: false + module: node style: type: default row: diff --git a/core/modules/views/config/views.view.tracker.yml b/core/modules/views/config/views.view.tracker.yml index 5d31e2f..f19d290 100644 --- a/core/modules/views/config/views.view.tracker.yml +++ b/core/modules/views/config/views.view.tracker.yml @@ -34,31 +34,37 @@ display: id: uid table: node field: uid + module: views fields: type: id: type table: node field: type + module: node title: id: title table: node field: title + module: node name: id: name table: users field: name relationship: uid label: Author + module: user comment_count: id: comment_count table: node_comment_statistics field: comment_count label: Replies + module: views last_comment_timestamp: id: last_comment_timestamp table: node_comment_statistics field: last_comment_timestamp label: 'Last Post' + module: comment timestamp: id: timestamp table: history @@ -66,6 +72,7 @@ display: label: '' link_to_node: 0 comments: 1 + module: node new_comments: id: new_comments table: node @@ -74,11 +81,13 @@ display: hide_empty: true suffix: ' new' link_to_comment: 1 + module: comment sorts: last_comment_timestamp: id: last_comment_timestamp table: node_comment_statistics field: last_comment_timestamp + module: views arguments: uid_touch: id: uid_touch @@ -92,6 +101,7 @@ display: summary: format: default_summary specify_validation: 1 + module: comment filters: status: id: status @@ -101,6 +111,7 @@ display: group: 0 expose: operator: false + module: views style: type: table options: diff --git a/core/modules/views/lib/Drupal/views/ViewExecutable.php b/core/modules/views/lib/Drupal/views/ViewExecutable.php index b295b9e..8b31819 100644 --- a/core/modules/views/lib/Drupal/views/ViewExecutable.php +++ b/core/modules/views/lib/Drupal/views/ViewExecutable.php @@ -2050,14 +2050,13 @@ public function addItem($display_id, $type, $table, $field, $options = array(), // If the desired type is not found, use the original value directly. $handler_type = !empty($types[$type]['type']) ? $types[$type]['type'] : $type; - - // @todo This variable is never used. $handler = views_get_handler($table, $field, $handler_type); $fields[$id] = array( 'id' => $id, 'table' => $table, 'field' => $field, + 'module' => $handler->definition['module'], ) + $options; $this->displayHandlers[$display_id]->setOption($types[$type]['plural'], $fields); diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_aggregate_count.yml b/core/modules/views/tests/views_test_config/config/views.view.test_aggregate_count.yml index 7a42247..e52c355 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_aggregate_count.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_aggregate_count.yml @@ -17,6 +17,7 @@ display: summary: format: default_summary table: node + module: node cache: type: none exposed_form: @@ -37,6 +38,7 @@ display: id: nid link_to_node: '0' table: node + module: node group_by: '1' pager: type: some diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_alias.yml b/core/modules/views/tests/views_test_config/config/views.view.test_alias.yml index 3755f24..11231e4 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_alias.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_alias.yml @@ -32,6 +32,7 @@ display: link_to_user: '1' overwrite_anonymous: '0' table: users + module: user filters: uid_raw: admin_label: '' @@ -71,6 +72,7 @@ display: max: '' min: '' value: '1' + module: views pager: type: full query: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_argument_default_fixed.yml b/core/modules/views/tests/views_test_config/config/views.view.test_argument_default_fixed.yml index 061b209..89c8909 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_argument_default_fixed.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_argument_default_fixed.yml @@ -17,6 +17,7 @@ display: must_not_be: '0' style_plugin: default_summary table: views + module: views cache: type: none exposed_form: @@ -37,6 +38,7 @@ display: id: title link_to_node: '0' table: node + module: node pager: options: id: '0' diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_comment_user_uid.yml b/core/modules/views/tests/views_test_config/config/views.view.test_comment_user_uid.yml index 4dca1cd..e098589 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_comment_user_uid.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_comment_user_uid.yml @@ -20,6 +20,7 @@ display: summary_options: items_per_page: '25' table: node + module: comment cache: type: none exposed_form: @@ -29,6 +30,7 @@ display: field: nid id: nid table: node + module: node pager: type: full query: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_destroy.yml b/core/modules/views/tests/views_test_config/config/views.view.test_destroy.yml index a28c6b1..1e97092 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_destroy.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_destroy.yml @@ -37,18 +37,21 @@ display: id: created_day style_plugin: default_summary table: node + module: node created_fulldate: default_argument_type: fixed field: created_fulldate id: created_fulldate style_plugin: default_summary table: node + module: node created_month: default_argument_type: fixed field: created_month id: created_month style_plugin: default_summary table: node + module: node cache: type: none empty: @@ -57,11 +60,13 @@ display: field: area id: area table: views + module: views area_1: empty: '0' field: area id: area_1 table: views + module: views exposed_form: type: basic fields: @@ -69,49 +74,59 @@ display: field: created id: created table: node + module: views nid: field: nid id: nid table: node + module: node path: field: path id: path table: node + module: node filters: nid: field: nid id: nid table: node + module: views status: field: status id: status table: node + module: views title: field: title id: title table: node + module: views footer: area: empty: '0' field: area id: area table: views + module: views area_1: empty: '0' field: area id: area_1 table: views + module: views header: area: empty: '0' field: area id: area table: views + module: views area_1: empty: '0' field: area id: area_1 table: views + module: views pager: type: full query: @@ -121,25 +136,30 @@ display: field: cid id: cid table: node + module: views pid: field: pid id: pid table: comment relationship: cid + module: views uid: field: uid id: uid table: comment relationship: cid + module: views sorts: last_comment_name: field: last_comment_name id: last_comment_name table: node_comment_statistics + module: comment last_comment_timestamp: field: last_comment_timestamp id: last_comment_timestamp table: node_comment_statistics + module: views style: type: default row: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_display.yml b/core/modules/views/tests/views_test_config/config/views.view.test_display.yml index 5c44bb2..e9902f2 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_display.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_display.yml @@ -45,6 +45,7 @@ display: field: title id: title table: node + module: node filters: status: field: status @@ -52,6 +53,7 @@ display: id: status table: node value: '1' + module: views pager: options: items_per_page: '10' @@ -69,6 +71,7 @@ display: id: created order: DESC table: node + module: views style_plugin: default title: 'Test Display' display_plugin: default diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_executable_displays.yml b/core/modules/views/tests/views_test_config/config/views.view.test_executable_displays.yml index 8feb580..df2b80a 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_executable_displays.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_executable_displays.yml @@ -16,7 +16,7 @@ display: position: '1' page_2: display_plugin: page - display_title: Page 2 + display_title: 'Page 2' id: page_2 position: '2' human_name: '' diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_feed_display.yml b/core/modules/views/tests/views_test_config/config/views.view.test_feed_display.yml index 6ba9d11..e5badf7 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_feed_display.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_feed_display.yml @@ -30,6 +30,7 @@ display: label: '' link_to_node: '1' table: node + module: node filters: status: expose: @@ -39,6 +40,7 @@ display: id: status table: node value: '1' + module: views pager: options: items_per_page: '10' @@ -57,6 +59,7 @@ display: id: created order: DESC table: node + module: views style: type: default title: test_feed_display @@ -66,7 +69,7 @@ display: position: '0' feed: display_options: - displays: {} + displays: { } pager: type: some path: test-feed-display.xml diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_field_get_entity.yml b/core/modules/views/tests/views_test_config/config/views.view.test_field_get_entity.yml index 5ba2fc9..c5a2333 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_field_get_entity.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_field_get_entity.yml @@ -17,16 +17,19 @@ display: field: cid id: cid table: comment + module: comment nid: field: nid id: nid table: node relationship: nid + module: node uid: field: uid id: uid table: users relationship: uid + module: user filter_groups: groups: { } operator: AND @@ -41,6 +44,7 @@ display: id: nid required: '1' table: comment + module: views uid: admin_label: '' field: uid @@ -50,6 +54,7 @@ display: relationship: nid required: '0' table: node + module: views sorts: { } style: type: default diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_field_tokens.yml b/core/modules/views/tests/views_test_config/config/views.view.test_field_tokens.yml index 01431a6..190fee8 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_field_tokens.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_field_tokens.yml @@ -21,18 +21,22 @@ display: id: name table: views_test_data field: name + module: null name_1: id: name_1 table: views_test_data field: name + module: null name_2: id: name_2 table: views_test_data field: name + module: null job: id: job table: views_test_data field: job + module: null style: type: default row: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_field_type.yml b/core/modules/views/tests/views_test_config/config/views.view.test_field_type.yml index c9172bc..2fcc562 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_field_type.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_field_type.yml @@ -11,6 +11,7 @@ display: field: type id: type table: node + module: node display_plugin: default display_title: Master id: default diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_filter_date_between.yml b/core/modules/views/tests/views_test_config/config/views.view.test_filter_date_between.yml index 71f4b2f..35a3960 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_filter_date_between.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_filter_date_between.yml @@ -17,11 +17,13 @@ display: field: nid id: nid table: node + module: node filters: created: field: created id: created table: node + module: views pager: type: full query: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_filter_group_override.yml b/core/modules/views/tests/views_test_config/config/views.view.test_filter_group_override.yml index 379eff6..4dd1891 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_filter_group_override.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_filter_group_override.yml @@ -21,6 +21,7 @@ display: id: title label: '' table: node + module: node filters: status: expose: @@ -30,6 +31,7 @@ display: id: status table: node value: '1' + module: views pager: type: full query: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_filter_groups.yml b/core/modules/views/tests/views_test_config/config/views.view.test_filter_groups.yml index d71c02e..6956de8 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_filter_groups.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_filter_groups.yml @@ -21,6 +21,7 @@ display: id: title label: '' table: node + module: node filter_groups: groups: 1: AND @@ -33,6 +34,7 @@ display: table: node value: value: '1' + module: views nid_1: field: nid group: '2' @@ -40,6 +42,7 @@ display: table: node value: value: '2' + module: views status: expose: operator: '0' @@ -48,6 +51,7 @@ display: id: status table: node value: '1' + module: views pager: options: items_per_page: '10' @@ -60,6 +64,7 @@ display: id: created order: DESC table: node + module: views title: test_filter_groups style: type: default @@ -86,6 +91,7 @@ display: table: node value: value: '1' + module: views nid_1: field: nid group: '2' @@ -93,6 +99,7 @@ display: table: node value: value: '2' + module: views status: expose: operator: '0' @@ -101,6 +108,7 @@ display: id: status table: node value: '1' + module: views path: test-filter-groups display_plugin: page display_title: Page diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_filter_node_uid_revision.yml b/core/modules/views/tests/views_test_config/config/views.view.test_filter_node_uid_revision.yml index 69000ec..5d1083e 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_filter_node_uid_revision.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_filter_node_uid_revision.yml @@ -17,6 +17,7 @@ display: id: nid table: node field: nid + module: node filter_groups: groups: 1: AND @@ -32,6 +33,7 @@ display: table: node value: - '1' + module: node sorts: { } pager: type: full diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_glossary.yml b/core/modules/views/tests/views_test_config/config/views.view.test_glossary.yml index 33045e5..a428347 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_glossary.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_glossary.yml @@ -21,6 +21,7 @@ display: summary_options: items_per_page: '25' table: node + module: views cache: type: none exposed_form: @@ -31,6 +32,7 @@ display: id: title label: '' table: node + module: node pager: type: full query: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_group_by_count.yml b/core/modules/views/tests/views_test_config/config/views.view.test_group_by_count.yml index 7ea0ab8..d8c3c34 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_group_by_count.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_group_by_count.yml @@ -29,6 +29,7 @@ display: id: nid link_to_node: '0' table: node + module: node type: alter: alter_text: '0' @@ -44,6 +45,7 @@ display: id: type link_to_node: '0' table: node + module: node group_by: '1' pager: type: some diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_group_by_in_filters.yml b/core/modules/views/tests/views_test_config/config/views.view.test_group_by_in_filters.yml index c494b09..007438d 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_group_by_in_filters.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_group_by_in_filters.yml @@ -28,6 +28,7 @@ display: id: type link_to_node: '0' table: node + module: node filters: nid: field: nid @@ -37,6 +38,7 @@ display: table: node value: value: '3' + module: views group_by: '1' pager: type: some diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_groupwise_term.yml b/core/modules/views/tests/views_test_config/config/views.view.test_groupwise_term.yml index 5240f0c..bcceac5 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_groupwise_term.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_groupwise_term.yml @@ -18,11 +18,13 @@ display: field: name id: name table: taxonomy_term_data + module: taxonomy nid: field: nid id: nid relationship: tid_representative table: node + module: node pager: options: items_per_page: '10' @@ -44,6 +46,7 @@ display: subquery_sort: node.nid subquery_view: '' table: taxonomy_term_data + module: views row: type: fields sorts: @@ -52,6 +55,7 @@ display: id: tid order: DESC table: taxonomy_term_data + module: views style: type: default title: test_groupwise diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_groupwise_user.yml b/core/modules/views/tests/views_test_config/config/views.view.test_groupwise_user.yml index 7d79d11..16372bc 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_groupwise_user.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_groupwise_user.yml @@ -19,11 +19,13 @@ display: field: name id: name table: users + module: user nid: field: nid id: nid relationship: uid_representative table: node + module: node filters: status: expose: @@ -33,6 +35,7 @@ display: id: status table: users value: '1' + module: views pager: options: items_per_page: '10' @@ -54,6 +57,7 @@ display: subquery_sort: node.nid subquery_view: '' table: users + module: views row: type: fields sorts: @@ -62,6 +66,7 @@ display: id: created order: DESC table: users + module: views style: type: default title: test_groupwise_user diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_handler_relationships.yml b/core/modules/views/tests/views_test_config/config/views.view.test_handler_relationships.yml index 409fb2c..88ca281 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_handler_relationships.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_handler_relationships.yml @@ -11,16 +11,19 @@ display: id: title table: node field: title + module: node relationships: cid: id: cid table: node field: cid + module: views nid: id: nid table: comment field: nid relationship: cid + module: views display_plugin: default display_title: Master id: default diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_node_revision_nid.yml b/core/modules/views/tests/views_test_config/config/views.view.test_node_revision_nid.yml index cefedda..7ebf2c4 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_node_revision_nid.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_node_revision_nid.yml @@ -10,26 +10,31 @@ display: id: nid table: node_revision field: nid - required: TRUE + required: true + module: views fields: vid: id: vid table: node_revision field: vid + module: views nid_1: id: nid_1 table: node_revision field: nid + module: views nid: id: nid table: node field: nid relationship: nid + module: node arguments: nid: - id: nid: + id: 'nid:' table: node_revision field: nid + module: node display_plugin: default display_title: Master id: default diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_node_revision_vid.yml b/core/modules/views/tests/views_test_config/config/views.view.test_node_revision_vid.yml index b36f549..12242fa 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_node_revision_vid.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_node_revision_vid.yml @@ -10,26 +10,31 @@ display: id: vid table: node_revision field: vid - required: TRUE + required: true + module: views fields: vid: id: vid table: node_revision field: vid + module: views nid_1: id: nid_1 table: node_revision field: nid + module: views nid: id: nid table: node field: nid relationship: vid + module: node arguments: nid: - id: nid: + id: 'nid:' table: node_revision field: nid + module: node display_plugin: default display_title: Master id: default diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_plugin_argument_default_current_user.yml b/core/modules/views/tests/views_test_config/config/views.view.test_plugin_argument_default_current_user.yml index 54180b6..70a4246 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_plugin_argument_default_current_user.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_plugin_argument_default_current_user.yml @@ -17,6 +17,7 @@ display: must_not_be: '0' style_plugin: default_summary table: views + module: views cache: type: none exposed_form: @@ -37,6 +38,7 @@ display: id: title link_to_node: '0' table: node + module: node pager: options: id: '0' diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_redirect_view.yml b/core/modules/views/tests/views_test_config/config/views.view.test_redirect_view.yml index 1217693..b920fcf 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_redirect_view.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_redirect_view.yml @@ -50,6 +50,7 @@ display: hide_empty: '0' empty_zero: '0' link_to_node: '1' + module: node filters: status: value: '1' @@ -59,12 +60,14 @@ display: expose: operator: '0' group: '1' + module: views sorts: created: id: created table: node field: created order: DESC + module: views title: test_redirect_view page_1: display_plugin: page diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_taxonomy_node_term_data.yml b/core/modules/views/tests/views_test_config/config/views.view.test_taxonomy_node_term_data.yml index 383766a..6cf9c4c 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_taxonomy_node_term_data.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_taxonomy_node_term_data.yml @@ -20,6 +20,7 @@ display: summary_options: items_per_page: '25' table: taxonomy_term_data + module: taxonomy tid_1: default_argument_type: fixed field: tid @@ -31,6 +32,7 @@ display: summary_options: items_per_page: '25' table: taxonomy_term_data + module: taxonomy cache: type: none exposed_form: @@ -47,6 +49,7 @@ display: table: node vocabularies: tags: '0' + module: taxonomy term_node_tid_1: field: term_node_tid id: term_node_tid_1 @@ -54,12 +57,14 @@ display: table: node vocabularies: tags: '0' + module: taxonomy sorts: nid: field: nid id: nid order: DESC - table: nid + table: node + module: node style: type: default row: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_tokens.yml b/core/modules/views/tests/views_test_config/config/views.view.test_tokens.yml index f6e640c..c402dc3 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_tokens.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_tokens.yml @@ -20,16 +20,19 @@ display: id: age relationship: none table: views_test_data + module: null id: field: id id: id relationship: none table: views_test_data + module: null name: field: name id: name relationship: none table: views_test_data + module: null pager: type: full options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_user_relationship.yml b/core/modules/views/tests/views_test_config/config/views.view.test_user_relationship.yml index 096fa16..983152f 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_user_relationship.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_user_relationship.yml @@ -37,6 +37,7 @@ display: link_to_user: '1' overwrite_anonymous: '0' table: users + module: user title: alter: absolute: '0' @@ -54,6 +55,7 @@ display: label: '' link_to_node: '1' table: node + module: node uid: alter: absolute: '0' @@ -77,6 +79,7 @@ display: id: uid link_to_user: '1' table: users + module: user pager: options: items_per_page: '10' diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_view.yml b/core/modules/views/tests/views_test_config/config/views.view.test_view.yml index 57dd103..dd3235c 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_view.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_view.yml @@ -17,16 +17,19 @@ display: id: age relationship: none table: views_test_data + module: null id: field: id id: id relationship: none table: views_test_data + module: null name: field: name id: name relationship: none table: views_test_data + module: null pager: options: offset: '0' @@ -39,6 +42,7 @@ display: order: ASC relationship: none table: views_test_data + module: null display_plugin: default display_title: Master id: default diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_view_argument_validate_numeric.yml b/core/modules/views/tests/views_test_config/config/views.view.test_view_argument_validate_numeric.yml index 446aa63..ed35475 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_view_argument_validate_numeric.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_view_argument_validate_numeric.yml @@ -18,6 +18,7 @@ display: table: views validate: type: numeric + module: views cache: type: none exposed_form: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_view_argument_validate_php.yml b/core/modules/views/tests/views_test_config/config/views.view.test_view_argument_validate_php.yml index 1b4dc28..43a21f5 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_view_argument_validate_php.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_view_argument_validate_php.yml @@ -18,6 +18,7 @@ display: table: views validate: type: php + module: views cache: type: none exposed_form: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_view_argument_validate_user.yml b/core/modules/views/tests/views_test_config/config/views.view.test_view_argument_validate_user.yml index 2750f43..f2558a0 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_view_argument_validate_user.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_view_argument_validate_user.yml @@ -18,6 +18,7 @@ display: table: views validate: type: user + module: views cache: type: none exposed_form: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_view_fieldapi.yml b/core/modules/views/tests/views_test_config/config/views.view.test_view_fieldapi.yml index fe2ecc0..6c3dade 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_view_fieldapi.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_view_fieldapi.yml @@ -13,6 +13,7 @@ display: field: nid id: nid table: node + module: node cache: type: none exposed_form: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_view_handler_weight.yml b/core/modules/views/tests/views_test_config/config/views.view.test_view_handler_weight.yml index cf47d54..3ba8f23 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_view_handler_weight.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_view_handler_weight.yml @@ -17,16 +17,19 @@ display: id: id relationship: none table: views_test_data + module: null age: field: age id: age relationship: none table: views_test_data + module: null name: field: name id: name relationship: none table: views_test_data + module: null pager: options: offset: '0' @@ -39,21 +42,25 @@ display: order: ASC relationship: none table: views_test_data + module: null age: field: age id: standard order: ASC relationship: none table: views_test_data + module: null filters: name: field: name id: string table: views_test_data + module: null age: field: age id: numeric table: views_test_data + module: null display_plugin: default display_title: Master id: default diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_view_pager_full_zero_items_per_page.yml b/core/modules/views/tests/views_test_config/config/views.view.test_view_pager_full_zero_items_per_page.yml index 5b909ea..926d227 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_view_pager_full_zero_items_per_page.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_view_pager_full_zero_items_per_page.yml @@ -28,6 +28,7 @@ display: id: title link_to_node: '0' table: node + module: node pager: options: id: '0' diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_views_handler_field_user_name.yml b/core/modules/views/tests/views_test_config/config/views.view.test_views_handler_field_user_name.yml index 48522e0..263d878 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_views_handler_field_user_name.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_views_handler_field_user_name.yml @@ -31,6 +31,7 @@ display: link_to_user: '1' overwrite_anonymous: '0' table: users + module: user pager: type: full query: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_views_move_to_field.yml b/core/modules/views/tests/views_test_config/config/views.view.test_views_move_to_field.yml index 22642b5..2c62f43 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_views_move_to_field.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_views_move_to_field.yml @@ -11,6 +11,7 @@ display: field: old_field_1 id: old_field_1 table: views_test_data + module: null display_plugin: default display_title: Master id: default diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_views_move_to_handler.yml b/core/modules/views/tests/views_test_config/config/views.view.test_views_move_to_handler.yml index d66c95d..eddc20b 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_views_move_to_handler.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_views_move_to_handler.yml @@ -11,11 +11,13 @@ display: field: old_field_2 id: old_field_2 table: views_test_data + module: null filters: old_field_3: field: old_field_3 id: old_field_3 table: views_test_data + module: null display_plugin: default display_title: Master id: default diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_views_move_to_table.yml b/core/modules/views/tests/views_test_config/config/views.view.test_views_move_to_table.yml index 956a7f0..5efc984 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_views_move_to_table.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_views_move_to_table.yml @@ -11,6 +11,7 @@ display: field: id id: id table: views_old_table + module: null display_plugin: default display_title: Master id: default diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_argument_default_current_user.yml b/core/modules/views/tests/views_test_data/config/views.view.test_argument_default_current_user.yml index 3cf754d..6bef92b 100644 --- a/core/modules/views/tests/views_test_data/config/views.view.test_argument_default_current_user.yml +++ b/core/modules/views/tests/views_test_data/config/views.view.test_argument_default_current_user.yml @@ -14,6 +14,7 @@ display: field: uid id: uid table: node + module: views cache: type: none exposed_form: @@ -34,6 +35,7 @@ display: id: title link_to_node: '0' table: node + module: node pager: options: id: '0' diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_click_sort.yml b/core/modules/views/tests/views_test_data/config/views.view.test_click_sort.yml index 8aa2eb2..6e5a10e 100644 --- a/core/modules/views/tests/views_test_data/config/views.view.test_click_sort.yml +++ b/core/modules/views/tests/views_test_data/config/views.view.test_click_sort.yml @@ -11,14 +11,17 @@ display: id: id table: views_test_data field: id + module: null name: id: name table: views_test_data field: name + module: null created: id: created table: views_test_data field: created + module: null display_options: access: type: none diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_example_area.yml b/core/modules/views/tests/views_test_data/config/views.view.test_example_area.yml index 2a8fb0b..974f85c 100644 --- a/core/modules/views/tests/views_test_data/config/views.view.test_example_area.yml +++ b/core/modules/views/tests/views_test_data/config/views.view.test_example_area.yml @@ -15,16 +15,19 @@ display: field: test_example id: test_example table: views + module: views_test_data footer: test_example: field: test_example id: test_example table: views + module: views_test_data empty: test_example: field: test_example id: test_example table: views + module: views_test_data display_plugin: default display_title: Master id: default diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_exposed_admin_ui.yml b/core/modules/views/tests/views_test_data/config/views.view.test_exposed_admin_ui.yml index d73dfb8..08f09e1 100644 --- a/core/modules/views/tests/views_test_data/config/views.view.test_exposed_admin_ui.yml +++ b/core/modules/views/tests/views_test_data/config/views.view.test_exposed_admin_ui.yml @@ -23,6 +23,7 @@ display: field: type id: type table: node + module: node pager: type: full sorts: @@ -30,6 +31,7 @@ display: field: created id: created table: node + module: views style: type: default row: diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_field_classes.yml b/core/modules/views/tests/views_test_data/config/views.view.test_field_classes.yml index d2fe5b2..8c5d6b5 100644 --- a/core/modules/views/tests/views_test_data/config/views.view.test_field_classes.yml +++ b/core/modules/views/tests/views_test_data/config/views.view.test_field_classes.yml @@ -15,6 +15,7 @@ display: id: id table: views_test_data field: id + module: null style: type: html_list display_plugin: default diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_field_output.yml b/core/modules/views/tests/views_test_data/config/views.view.test_field_output.yml index 6d0d73f..b5bc1c5 100644 --- a/core/modules/views/tests/views_test_data/config/views.view.test_field_output.yml +++ b/core/modules/views/tests/views_test_data/config/views.view.test_field_output.yml @@ -15,6 +15,7 @@ display: id: name table: views_test_data field: name + module: null style: type: html_list display_plugin: default diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_filter.yml b/core/modules/views/tests/views_test_data/config/views.view.test_filter.yml index 3f11e83..7eeef9c 100644 --- a/core/modules/views/tests/views_test_data/config/views.view.test_filter.yml +++ b/core/modules/views/tests/views_test_data/config/views.view.test_filter.yml @@ -20,11 +20,13 @@ display: id: name label: '' table: views_test_data + module: null filters: type: field: name id: test_filter table: views_test_data + module: null query: type: views_query use_more_always: '0' diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_filter_in_operator_ui.yml b/core/modules/views/tests/views_test_data/config/views.view.test_filter_in_operator_ui.yml index a68c790..3985bec 100644 --- a/core/modules/views/tests/views_test_data/config/views.view.test_filter_in_operator_ui.yml +++ b/core/modules/views/tests/views_test_data/config/views.view.test_filter_in_operator_ui.yml @@ -24,6 +24,7 @@ display: field: type id: type table: node + module: node pager: type: full style: diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_handler_test_access.yml b/core/modules/views/tests/views_test_data/config/views.view.test_handler_test_access.yml index f7cbce5..61c67b8 100644 --- a/core/modules/views/tests/views_test_data/config/views.view.test_handler_test_access.yml +++ b/core/modules/views/tests/views_test_data/config/views.view.test_handler_test_access.yml @@ -9,37 +9,45 @@ display: id: access_callback table: views_test_data field: access_callback + module: null access_callback_arguments: id: access_callback_arguments table: views_test_data field: access_callback_arguments + module: null filters: access_callback: id: access_callback table: views_test_data field: access_callback + module: null access_callback_arguments: id: access_callback_arguments table: views_test_data field: access_callback_arguments + module: null arguments: access_callback: id: access_callback table: views_test_data field: access_callback + module: null access_callback_arguments: id: access_callback_arguments table: views_test_data field: access_callback_arguments + module: null sorts: access_callback: id: access_callback table: views_test_data field: access_callback + module: null access_callback_arguments: id: access_callback_arguments table: views_test_data field: access_callback_arguments + module: null display_plugin: default display_title: Master id: default diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_rename_reset_button.yml b/core/modules/views/tests/views_test_data/config/views.view.test_rename_reset_button.yml index e03d666..11e18e7 100644 --- a/core/modules/views/tests/views_test_data/config/views.view.test_rename_reset_button.yml +++ b/core/modules/views/tests/views_test_data/config/views.view.test_rename_reset_button.yml @@ -25,6 +25,7 @@ display: field: type id: type table: node + module: node pager: type: full query: diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_style_mapping.yml b/core/modules/views/tests/views_test_data/config/views.view.test_style_mapping.yml index 30d4dd9..cab7ece 100644 --- a/core/modules/views/tests/views_test_data/config/views.view.test_style_mapping.yml +++ b/core/modules/views/tests/views_test_data/config/views.view.test_style_mapping.yml @@ -17,16 +17,19 @@ display: id: age relationship: none table: views_test_data + module: null job: field: job id: job relationship: none table: views_test_data + module: null name: field: name id: name relationship: none table: views_test_data + module: null pager: options: offset: '0' @@ -39,6 +42,7 @@ display: order: ASC relationship: none table: views_test_data + module: null style: type: mapping_test options: