archive/bramw_baserow
1
0
Fork 0
mirror of https://gitlab.com/bramw/baserow.git synced 2025-04-04 21:25:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix-chart-duplicate-series' into 'develop'

Browse source 
Fix checking for duplicate series in chart

See merge request
This commit is contained in:
Petr Stribny 2025-03-13 07:56:49 +00:00
commit e5f703f66e
1 changed files with 3 additions and 2 deletions

5
enterprise/backend/src/baserow_enterprise/integrations/local_baserow/service_types.py
View file

@ -178,7 +178,7 @@ class LocalBaserowGroupedAggregateRowsUserServiceType(
)
else:
# It is still possible to have multiple undefined series
if series_aggregation_reference != "field_None_":
if agg_series["field_id"] and agg_series["aggregation_type"]:
series_agg_used.add(series_aggregation_reference)
return True
@ -581,7 +581,8 @@ class LocalBaserowGroupedAggregateRowsUserServiceType(
f"aggregation type {agg_series.aggregation_type} can only be defined once."
)
else:
series_agg_used.add(series_aggregation_reference)
if agg_series.field and agg_series.aggregation_type:
series_agg_used.add(series_aggregation_reference)
combined_agg_dict |= agg_type._get_aggregation_dict(
queryset, model_field, agg_series.field, include_agg_type=True