diff --git a/the_views_integration-2786577-229.patch b/the_views_integration-2786577-229.patch index fd6204a..73e67bb 100644 --- a/the_views_integration-2786577-229.patch +++ b/the_views_integration-2786577-229.patch @@ -1,5 +1,5 @@ diff --git a/core/modules/datetime/datetime.views.inc b/core/modules/datetime/datetime.views.inc -index d3b0d18..371c464 100644 +index 93d6cd4d30..8c8022e4ed 100644 --- a/core/modules/datetime/datetime.views.inc +++ b/core/modules/datetime/datetime.views.inc @@ -11,18 +11,42 @@ @@ -67,9 +67,9 @@ index d3b0d18..371c464 100644 - 'field' => $field_storage->getName() . '_value', + 'field' => $field_storage->getName() . '_' . $column_name, 'id' => 'datetime_' . $argument_type, - ], - 'group' => $group, -@@ -45,7 +74,7 @@ function datetime_field_views_data(FieldStorageConfigInterface $field_storage) { + 'entity_type' => $field_storage->getTargetEntityTypeId(), + 'field_name' => $field_storage->getName(), +@@ -47,7 +76,7 @@ function datetime_field_views_data(FieldStorageConfigInterface $field_storage) { } // Set the 'datetime' sort handler. @@ -79,24 +79,24 @@ index d3b0d18..371c464 100644 return $data; diff --git a/core/modules/datetime/tests/src/Kernel/Views/DateTimeHandlerTestBase.php b/core/modules/datetime/tests/src/Kernel/Views/DateTimeHandlerTestBase.php -index f0c9c78..e102c2f 100644 +index 20a3542319..0340ba450d 100644 --- a/core/modules/datetime/tests/src/Kernel/Views/DateTimeHandlerTestBase.php +++ b/core/modules/datetime/tests/src/Kernel/Views/DateTimeHandlerTestBase.php -@@ -29,6 +29,13 @@ +@@ -28,6 +28,13 @@ + */ protected static $field_name = 'field_date'; - /** ++ /** + * Type of the field. + * + * @var string + */ + protected static $field_type = 'datetime'; + -+ /** + /** * Nodes to test. * - * @var \Drupal\node\NodeInterface[] -@@ -53,7 +60,7 @@ protected function setUp($import_test_views = TRUE) { +@@ -54,7 +61,7 @@ protected function setUp($import_test_views = TRUE) { $fieldStorage = FieldStorageConfig::create([ 'field_name' => static::$field_name, 'entity_type' => 'node', @@ -106,7 +106,7 @@ index f0c9c78..e102c2f 100644 ]); $fieldStorage->save(); diff --git a/core/modules/datetime_range/datetime_range.module b/core/modules/datetime_range/datetime_range.module -index b2b87da..03f9f53 100644 +index b2b87dae7a..03f9f535e5 100644 --- a/core/modules/datetime_range/datetime_range.module +++ b/core/modules/datetime_range/datetime_range.module @@ -6,6 +6,8 @@ @@ -253,7 +253,7 @@ index b2b87da..03f9f53 100644 + } +} diff --git a/core/modules/datetime_range/datetime_range.post_update.php b/core/modules/datetime_range/datetime_range.post_update.php -index b5f3f5d..8cd82c8 100644 +index b5f3f5d310..8cd82c8670 100644 --- a/core/modules/datetime_range/datetime_range.post_update.php +++ b/core/modules/datetime_range/datetime_range.post_update.php @@ -5,9 +5,88 @@ @@ -347,7 +347,7 @@ index b5f3f5d..8cd82c8 100644 +} diff --git a/core/modules/datetime_range/datetime_range.views.inc b/core/modules/datetime_range/datetime_range.views.inc new file mode 100644 -index 0000000..6892ab2 +index 0000000000..6892ab244e --- /dev/null +++ b/core/modules/datetime_range/datetime_range.views.inc @@ -0,0 +1,24 @@ @@ -377,7 +377,7 @@ index 0000000..6892ab2 +} diff --git a/core/modules/datetime_range/tests/fixtures/update/datetime_range-filter-values.php b/core/modules/datetime_range/tests/fixtures/update/datetime_range-filter-values.php new file mode 100644 -index 0000000..952e67a +index 0000000000..952e67a16c --- /dev/null +++ b/core/modules/datetime_range/tests/fixtures/update/datetime_range-filter-values.php @@ -0,0 +1,332 @@ @@ -715,7 +715,7 @@ index 0000000..952e67a + diff --git a/core/modules/datetime_range/tests/fixtures/update/field.field.node.page.field_range.yml b/core/modules/datetime_range/tests/fixtures/update/field.field.node.page.field_range.yml new file mode 100644 -index 0000000..1b98429 +index 0000000000..1b984295e9 --- /dev/null +++ b/core/modules/datetime_range/tests/fixtures/update/field.field.node.page.field_range.yml @@ -0,0 +1,21 @@ @@ -742,7 +742,7 @@ index 0000000..1b98429 +field_type: daterange diff --git a/core/modules/datetime_range/tests/fixtures/update/field.storage.node.field_range.yml b/core/modules/datetime_range/tests/fixtures/update/field.storage.node.field_range.yml new file mode 100644 -index 0000000..26d610e +index 0000000000..26d610e724 --- /dev/null +++ b/core/modules/datetime_range/tests/fixtures/update/field.storage.node.field_range.yml @@ -0,0 +1,20 @@ @@ -768,7 +768,7 @@ index 0000000..26d610e +custom_storage: false diff --git a/core/modules/datetime_range/tests/fixtures/update/views.view.test_datetime_range_filter_values.yml b/core/modules/datetime_range/tests/fixtures/update/views.view.test_datetime_range_filter_values.yml new file mode 100644 -index 0000000..9afc264 +index 0000000000..9afc26412c --- /dev/null +++ b/core/modules/datetime_range/tests/fixtures/update/views.view.test_datetime_range_filter_values.yml @@ -0,0 +1,231 @@ @@ -1005,7 +1005,7 @@ index 0000000..9afc264 + tags: { } diff --git a/core/modules/datetime_range/tests/src/Functional/Update/DatetimeRangeViewUpdateTest.php b/core/modules/datetime_range/tests/src/Functional/Update/DatetimeRangeViewUpdateTest.php new file mode 100644 -index 0000000..306f4ba +index 0000000000..306f4ba7d7 --- /dev/null +++ b/core/modules/datetime_range/tests/src/Functional/Update/DatetimeRangeViewUpdateTest.php @@ -0,0 +1,74 @@ @@ -1085,7 +1085,7 @@ index 0000000..306f4ba +} diff --git a/core/modules/datetime_range/tests/src/Kernel/Views/FilterDateTest.php b/core/modules/datetime_range/tests/src/Kernel/Views/FilterDateTest.php new file mode 100644 -index 0000000..0f31dd4 +index 0000000000..0f31dd4ecc --- /dev/null +++ b/core/modules/datetime_range/tests/src/Kernel/Views/FilterDateTest.php @@ -0,0 +1,164 @@