diff --git a/core/modules/comment/config/optional/views.view.comment.yml b/core/modules/comment/config/optional/views.view.comment.yml index b91a9be5af..db85e63716 100644 --- a/core/modules/comment/config/optional/views.view.comment.yml +++ b/core/modules/comment/config/optional/views.view.comment.yml @@ -177,7 +177,7 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - action_title: 'Action' + action_title: Action include_exclude: include selected_actions: - comment_delete_action @@ -746,47 +746,6 @@ display: name: name name_1: name_1 plugin_id: combine - comment_type: - id: comment_type - table: comment_field_data - field: comment_type - relationship: none - group_type: group - admin_label: '' - operator: in - value: { } - group: 1 - exposed: true - expose: - operator_id: comment_type_op - label: 'Comment type' - description: '' - use_operator: false - operator: comment_type_op - identifier: comment_type - required: false - remember: false - multiple: false - remember_roles: - authenticated: authenticated - anonymous: '0' - administrator: '0' - reduce: false - is_grouped: false - group_info: - label: '' - description: '' - identifier: '' - optional: true - widget: select - multiple: false - remember: false - default_group: All - default_group_multiple: { } - group_items: { } - entity_type: comment - entity_field: comment_type - plugin_id: bundle langcode: id: langcode table: comment_field_data @@ -1060,47 +1019,6 @@ display: name: name name_1: name_1 plugin_id: combine - comment_type: - id: comment_type - table: comment_field_data - field: comment_type - relationship: none - group_type: group - admin_label: '' - operator: in - value: { } - group: 1 - exposed: true - expose: - operator_id: comment_type_op - label: 'Comment Type' - description: '' - use_operator: false - operator: comment_type_op - identifier: comment_type - required: false - remember: false - multiple: false - remember_roles: - authenticated: authenticated - anonymous: '0' - administrator: '0' - reduce: false - is_grouped: false - group_info: - label: '' - description: '' - identifier: '' - optional: true - widget: select - multiple: false - remember: false - default_group: All - default_group_multiple: { } - group_items: { } - entity_type: comment - entity_field: comment_type - plugin_id: bundle langcode: id: langcode table: comment_field_data @@ -1196,7 +1114,7 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - action_title: 'Action' + action_title: Action include_exclude: include selected_actions: - comment_delete_action diff --git a/core/modules/comment/src/Tests/Views/CommentAdminTest.php b/core/modules/comment/src/Tests/Views/CommentAdminTest.php index 2c47a7b751..12324ae2d8 100644 --- a/core/modules/comment/src/Tests/Views/CommentAdminTest.php +++ b/core/modules/comment/src/Tests/Views/CommentAdminTest.php @@ -53,7 +53,6 @@ public function testApprovalAdminInterface() { // Assert the expose filters on the admin page. $this->assertField('subject'); $this->assertField('combine'); - $this->assertField('comment_type'); $this->assertField('langcode'); $this->drupalLogout(); @@ -108,7 +107,6 @@ public function testApprovalAdminInterface() { // Assert the expose filters on the admin page. $this->assertField('subject'); $this->assertField('combine'); - $this->assertField('comment_type'); $this->assertField('langcode'); $edit = [ diff --git a/core/modules/comment/tests/src/Kernel/Views/CommentAdminViewTest.php b/core/modules/comment/tests/src/Kernel/Views/CommentAdminViewTest.php index 0572e89236..856fbcfe9a 100644 --- a/core/modules/comment/tests/src/Kernel/Views/CommentAdminViewTest.php +++ b/core/modules/comment/tests/src/Kernel/Views/CommentAdminViewTest.php @@ -145,7 +145,6 @@ protected function doTestFilters($display_id) { // Assert the expose filters on the admin page. $this->assertField('subject'); $this->assertField('combine'); - $this->assertField('comment_type'); $this->assertField('langcode'); $elements = $this->cssSelect('input[type="checkbox"]'); @@ -191,16 +190,6 @@ protected function doTestFilters($display_id) { $this->assertEquals(1, count($elements), 'Only admin comment is visible.'); $executable->destroy(); - // Test the comment type filter. - $executable->setExposedInput(['comment_type' => 'comment']); - $build = $executable->preview($display_id); - $this->setRawContent($renderer->renderRoot($build)); - $this->verbose($this->getRawContent()); - - $elements = $this->cssSelect('input[type="checkbox"]'); - $this->assertEquals(2, count($elements), 'Both comments are visible.'); - $executable->destroy(); - // Test the language filter. $executable->setExposedInput(['langcode' => '***LANGUAGE_site_default***']); $build = $executable->preview($display_id);