diff --git a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rest.yml b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rest.yml index 7ef0e9a..d538aa3 100644 --- a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rest.yml +++ b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rest.yml @@ -305,7 +305,7 @@ display: group_column: value group_columns: { } group_rows: true - delta_limit: all + delta_limit: 0 delta_offset: 0 delta_reversed: false delta_first_last: false diff --git a/core/modules/field/config/schema/field.views.schema.yml b/core/modules/field/config/schema/field.views.schema.yml index 07200a8..85c501f 100644 --- a/core/modules/field/config/schema/field.views.schema.yml +++ b/core/modules/field/config/schema/field.views.schema.yml @@ -42,7 +42,7 @@ views.field.field: type: boolean label: 'Display all values in the same row' delta_limit: - type: string + type: integer label: 'Field' delta_offset: type: integer diff --git a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_node_display_field.yml b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_node_display_field.yml index 1c50adb..fee70b9 100644 --- a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_node_display_field.yml +++ b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_node_display_field.yml @@ -100,7 +100,7 @@ display: group_column: value group_columns: { } group_rows: true - delta_limit: all + delta_limit: 0 delta_offset: 0 delta_reversed: false delta_first_last: false diff --git a/core/modules/views/src/Plugin/views/field/Field.php b/core/modules/views/src/Plugin/views/field/Field.php index 5a146f8..111a960 100644 --- a/core/modules/views/src/Plugin/views/field/Field.php +++ b/core/modules/views/src/Plugin/views/field/Field.php @@ -192,7 +192,7 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o // Otherwise, we only limit values if the user hasn't selected "all", 0, or // the value matching field cardinality. - if ((intval($this->options['delta_limit']) && ($this->options['delta_limit'] != $cardinality)) || intval($this->options['delta_offset'])) { + if ((($this->options['delta_limit'] > 0) && ($this->options['delta_limit'] != $cardinality)) || intval($this->options['delta_offset'])) { $this->limit_values = TRUE; } } @@ -394,7 +394,7 @@ protected function defineOptions() { // If we know the exact number of allowed values, then that can be // the default. Otherwise, default to 'all'. $options['delta_limit'] = array( - 'default' => ($field_storage_definition->getCardinality() > 1) ? $field_storage_definition->getCardinality() : 'all', + 'default' => ($field_storage_definition->getCardinality() > 1) ? $field_storage_definition->getCardinality() : 0, ); $options['delta_offset'] = array( 'default' => 0, @@ -830,7 +830,7 @@ function process_entity(ResultRow $values, EntityInterface $entity) { // We should only get here in this case if there's an offset, and // in that case we're limiting to all values after the offset. - if ($delta_limit == 'all') { + if ($delta_limit === 0) { $delta_limit = count($all_values) - $offset; } } diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_rows.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_rows.yml index 3eb8eb2..a3c350c 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_rows.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_rows.yml @@ -91,7 +91,7 @@ display: group_column: value group_columns: { } group_rows: true - delta_limit: all + delta_limit: 0 delta_offset: 0 delta_reversed: false delta_first_last: false diff --git a/core/modules/views/tests/src/Unit/Plugin/field/FieldTest.php b/core/modules/views/tests/src/Unit/Plugin/field/FieldTest.php index 08f5c42..c4efcdb 100644 --- a/core/modules/views/tests/src/Unit/Plugin/field/FieldTest.php +++ b/core/modules/views/tests/src/Unit/Plugin/field/FieldTest.php @@ -134,7 +134,7 @@ public function testDefineOptionsWithNoOptions() { $handler->init($this->executable, $this->display, $options); $this->assertEquals('value', $handler->options['group_column']); - $this->assertEquals('all', $handler->options['delta_limit']); + $this->assertEquals(0, $handler->options['delta_limit']); } /**