Skip to content

Commit

Permalink
Merge pull request #5240 from specify/issue-5154
Browse files Browse the repository at this point in the history
Fix Table Aggregation Separator being set to undefined if it matches default "; "
  • Loading branch information
alesan99 authored Aug 28, 2024
2 parents d58797e + 5378b96 commit f58f0d4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ const aggregatorSpec = f.store(() =>
),
separator: pipe(
syncers.xmlAttribute('separator', 'empty', false),
syncers.default(localized('; '))
syncers.fallback(localized('; '))
),
suffix: syncers.xmlAttribute('ending', 'empty', false),
limit: pipe(
Expand Down
2 changes: 1 addition & 1 deletion specifyweb/stored_queries/format.py
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ def aggregate(self, query: QueryConstruct,
formatter_name = aggregator_formatter_name
if not self.hasFormatterDef(specify_model, aggregator_formatter_name):
formatter_name = aggregatorNode.attrib.get('format', None)
separator = aggregatorNode.attrib.get('separator', ',')
separator = aggregatorNode.attrib.get('separator', '; ')
order_by = aggregatorNode.attrib.get('orderfieldname', '')
limit = aggregatorNode.attrib.get('count', '')
limit = None if limit == '' or int(limit) == 0 else limit
Expand Down

0 comments on commit f58f0d4

Please sign in to comment.