Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2735997 by ramil g, joelpittet, ranjith_kumar_k_u, asad_ahmed, nikita_tt, mschudders, Ben Greenberg, lendude, playful: Decimal separator and decimals settings ignored when aggregating decimal fields

merge-requests/9103/merge
catch 2025-03-21 09:08:14 +00:00
parent c8c538e760
commit d15e2ea581
2 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/modules/views/src/Plugin/views/query/Sql.php
View File

@ -1790,7 +1790,6 @@ class Sql extends QueryPluginBase {
'method' => 'aggregationMethodSimple',
'handler' => [
'argument' => 'groupby_numeric',
'field' => 'numeric',
'filter' => 'groupby_numeric',
'sort' => 'groupby_numeric',
],
@ -1800,7 +1799,6 @@ class Sql extends QueryPluginBase {
'method' => 'aggregationMethodDistinct',
'handler' => [
'argument' => 'groupby_numeric',
'field' => 'numeric',
'filter' => 'groupby_numeric',
'sort' => 'groupby_numeric',
],
@ -1810,7 +1808,6 @@ class Sql extends QueryPluginBase {
'method' => 'aggregationMethodSimple',
'handler' => [
'argument' => 'groupby_numeric',
'field' => 'numeric',
'filter' => 'groupby_numeric',
'sort' => 'groupby_numeric',
],
@ -1820,7 +1817,6 @@ class Sql extends QueryPluginBase {
'method' => 'aggregationMethodSimple',
'handler' => [
'argument' => 'groupby_numeric',
'field' => 'numeric',
'filter' => 'groupby_numeric',
'sort' => 'groupby_numeric',
],
@ -1830,7 +1826,6 @@ class Sql extends QueryPluginBase {
'method' => 'aggregationMethodSimple',
'handler' => [
'argument' => 'groupby_numeric',
'field' => 'numeric',
'filter' => 'groupby_numeric',
'sort' => 'groupby_numeric',
],
@ -1840,7 +1835,6 @@ class Sql extends QueryPluginBase {
'method' => 'aggregationMethodSimple',
'handler' => [
'argument' => 'groupby_numeric',
'field' => 'numeric',
'filter' => 'groupby_numeric',
'sort' => 'groupby_numeric',
],
@ -1850,7 +1844,6 @@ class Sql extends QueryPluginBase {
'method' => 'aggregationMethodSimple',
'handler' => [
'argument' => 'groupby_numeric',
'field' => 'numeric',
'filter' => 'groupby_numeric',
'sort' => 'groupby_numeric',
],

31
core/modules/views_ui/tests/src/Functional/FieldUITest.php
View File

@ -25,7 +25,17 @@ class FieldUITest extends UITestBase {
*
* @var array
*/
public static $testViews = ['test_view'];
public static $testViews = [
'test_view',
'test_aggregate_count',
];
/**
* {@inheritdoc}
*/
protected static $modules = [
'entity_test',
];
/**
* Tests the UI of field handlers.
@ -104,4 +114,23 @@ class FieldUITest extends UITestBase {
$this->assertEquals('', $view->field['title']->options['label'], 'The field label for normal styles are empty.');
}
/**
* Tests the UI of field aggregation settings.
*/
public function testFieldAggregationSettings(): void {
$edit_handler_url = 'admin/structure/views/nojs/handler-group/test_aggregate_count/default/field/id';
$this->drupalGet($edit_handler_url);
$this->submitForm(['options[group_type]' => 'count'], 'Apply');
$this->assertSession()
->pageTextNotContains('The website encountered an unexpected error. Try again later.');
$this->drupalGet($edit_handler_url);
$dropdown = $this->getSession()->getPage()->find('named', ['select', 'options[group_column]']);
// Ensure the dropdown for group column exists.
$this->assertNotNull($dropdown, 'The dropdown for options[group_column] does not exist.');
$this->submitForm(['options[group_type]' => 'count'], 'Apply');
// Ensure that there is no error after submitting the form.
$this->assertSession()
->pageTextNotContains('The website encountered an unexpected error. Try again later.');
}
}