Skip to content

Fix Table Aggregation Separator being set to undefined if it matches default "; " #5240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 28, 2024
Merged

Fix Table Aggregation Separator being set to undefined if it matches default "; " #5240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3940702
Switch syncers.default to syncers.fallback
alesan99 Aug 21, 2024
28108c0
Update default separator on backend to match frontend
alesan99 Aug 21, 2024
5378b96
Merge branch 'production' into issue-5154
alesan99 Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion specifyweb/frontend/js_src/lib/components/Formatters/spec.ts
View file
Open in desktop
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
View file
Open in desktop
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