diff --git a/core/modules/views/config/schema/views.display.schema.yml b/core/modules/views/config/schema/views.display.schema.yml index 6531990..1493cd8 100644 --- a/core/modules/views/config/schema/views.display.schema.yml +++ b/core/modules/views/config/schema/views.display.schema.yml @@ -18,6 +18,9 @@ views.display.page: type: views_display_path label: 'Page display options' mapping: + enabled: + type: boolean + label: 'Status' menu: type: mapping label: 'Menu' @@ -67,6 +70,9 @@ views.display.block: type: views_display label: 'Block display options' mapping: + enabled: + type: boolean + label: 'Status' block_description: type: label label: 'Block name' @@ -88,6 +94,9 @@ views.display.feed: type: views_display_path label: 'Feed display options' mapping: + enabled: + type: boolean + label: 'Status' sitename_title: type: boolean label: 'Use the site name for the title' @@ -104,11 +113,18 @@ views.display.feed: views.display.embed: type: views_display label: 'Embed display options' + mapping: + enabled: + type: boolean + label: 'Status' views.display.attachment: type: views_display label: 'Attachment display options' mapping: + enabled: + type: boolean + label: 'Status' displays: type: sequence label: 'Attach to' diff --git a/core/modules/views/src/Tests/Plugin/DisabledDisplayTest.php b/core/modules/views/src/Tests/Plugin/DisabledDisplayTest.php new file mode 100644 index 0000000..800cb6a --- /dev/null +++ b/core/modules/views/src/Tests/Plugin/DisabledDisplayTest.php @@ -0,0 +1,83 @@ +enableViewsTestModule(); + + $admin_user = $this->drupalCreateUser(array('administer site configuration')); + $this->drupalLogin($admin_user); + } + + /** + * Tests that views didsplays can be disabled. + */ + public function testDisplayOutput() { + // The displays defined in this view. + $display_ids = array('attachment_1', 'block_1', 'embed_1', 'feed_1', 'page_1', 'page_2'); + + $this->drupalCreateContentType(['type' => 'page']); + $this->drupalCreateNode(); + + $view = $this->container->get('entity.manager')->getStorage('view')->load('test_display_feed'); + + $this->drupalGet('test-disabled-display'); + $result = $this->xpath('//title'); + $this->assertEqual($result[0], 'test-disabled-display', 'The enabled page display is accessible.'); + + // Disabled page view should 404. + $this->drupalGet('test-disabled-display-2'); + $this->assertResponse(404); + + // Enable each disabled display and save the view. + foreach ($display_ids as $display_id) { + $view->getExecutable()->displayHandlers->get($display_id)->setOption('enabled', TRUE); + } + $view->save(); + + // Check that the originally disabled page_2 display is now enabled. + $this->drupalGet('test-disabled-display-2'); + $result = $this->xpath('//title'); + $this->assertEqual($result[0], 'test-disabled-display', 'The enabled page_2 display is accessible.'); + + // Disable each disabled display and save the view. + foreach ($display_ids as $display_id) { + $view->getExecutable()->displayHandlers->get($display_id)->setOption('enabled', FALSE); + } + $view->save(); + + // Check that the originally enabled page_1 display is now disabled. + $this->drupalGet('test-disabled-display'); + $this->assertResponse(404); + } + +} diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_disabled_display.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_disabled_display.yml new file mode 100644 index 0000000..31db06e --- /dev/null +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_disabled_display.yml @@ -0,0 +1,216 @@ +langcode: und +status: true +dependencies: + config: + - core.entity_view_mode.node.teaser + module: + - node + - user +id: test_disabled_display +label: test_disabled_display +module: views +description: '' +tag: '' +base_table: node +base_field: nid +core: 8.x +display: + default: + display_plugin: default + id: default + display_title: Master + position: 0 + display_options: + access: + type: perm + options: + perm: 'access content' + cache: + type: none + options: { } + query: + type: views_query + options: + disable_sql_rewrite: false + distinct: false + replica: false + query_comment: false + query_tags: { } + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + pager: + type: full + options: + items_per_page: 10 + offset: 0 + id: 0 + total_pages: null + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + tags: + previous: '‹ previous' + next: 'next ›' + first: '« first' + last: 'last »' + quantity: 9 + style: + type: default + row: + type: 'entity:node' + options: + view_mode: teaser + fields: + title: + id: title + table: node_field_data + field: title + entity_type: node + entity_field: title + label: '' + alter: + alter_text: false + make_link: false + absolute: false + trim: false + word_boundary: false + ellipsis: false + strip_tags: false + html: false + hide_empty: false + empty_zero: false + link_to_node: true + plugin_id: node + relationship: none + group_type: group + admin_label: '' + exclude: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_alter_empty: true + filters: + status: + value: true + table: node_field_data + field: status + plugin_id: boolean + entity_type: node + entity_field: status + id: status + expose: + operator: '' + group: 1 + sorts: + created: + id: created + table: node_field_data + field: created + order: DESC + entity_type: node + entity_field: created + plugin_id: date + relationship: none + group_type: group + admin_label: '' + exposed: false + expose: + label: '' + granularity: second + title: test_disabled_display + header: { } + footer: { } + empty: { } + relationships: { } + arguments: { } + display_extenders: { } + field_langcode: '***LANGUAGE_language_content***' + field_langcode_add_to_query: null + attachment_1: + display_plugin: attachment + id: attachment_1 + display_title: 'Attachment Disabled' + position: 1 + display_options: + display_extenders: { } + field_langcode: '***LANGUAGE_language_content***' + field_langcode_add_to_query: null + displays: + page_2: page_2 + display_description: '' + enabled: false + block_1: + display_plugin: block + id: block_1 + display_title: 'Block Disabled' + position: 1 + display_options: + display_extenders: { } + field_langcode: '***LANGUAGE_language_content***' + field_langcode_add_to_query: null + display_description: '' + enabled: false + embed_1: + display_plugin: embed + id: embed_1 + display_title: 'Embed Disabled' + position: 1 + display_options: + display_extenders: { } + field_langcode: '***LANGUAGE_language_content***' + field_langcode_add_to_query: null + display_description: '' + enabled: false + feed_1: + display_plugin: feed + id: feed_1 + display_title: 'Feed Disabled' + position: 1 + display_options: + display_extenders: { } + field_langcode: '***LANGUAGE_language_content***' + field_langcode_add_to_query: null + display_description: '' + enabled: false + path: test-disabled-display.xml + page_1: + display_plugin: page + id: page_1 + display_title: Page + position: 1 + display_options: + display_extenders: { } + field_langcode: '***LANGUAGE_language_content***' + field_langcode_add_to_query: null + path: test-disabled-display + page_2: + display_plugin: page + id: page_2 + display_title: 'Page Disabled' + position: 2 + display_options: + display_extenders: { } + field_langcode: '***LANGUAGE_language_content***' + field_langcode_add_to_query: null + path: test-disabled-display-2 + display_description: '' + enabled: false