From 3940702be42255f81cc5098a67b051d5f623b534 Mon Sep 17 00:00:00 2001 From: alesan99 Date: Wed, 21 Aug 2024 12:30:23 -0500 Subject: [PATCH 1/2] Switch syncers.default to syncers.fallback --- specifyweb/frontend/js_src/lib/components/Formatters/spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specifyweb/frontend/js_src/lib/components/Formatters/spec.ts b/specifyweb/frontend/js_src/lib/components/Formatters/spec.ts index 7425d54bac4..fc1651d82a3 100644 --- a/specifyweb/frontend/js_src/lib/components/Formatters/spec.ts +++ b/specifyweb/frontend/js_src/lib/components/Formatters/spec.ts @@ -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( From 28108c01e4a55660fa57da9e07aaa997bfa68076 Mon Sep 17 00:00:00 2001 From: alesan99 Date: Wed, 21 Aug 2024 12:54:43 -0500 Subject: [PATCH 2/2] Update default separator on backend to match frontend --- specifyweb/stored_queries/format.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specifyweb/stored_queries/format.py b/specifyweb/stored_queries/format.py index e203cd1efe7..d1359e942e3 100644 --- a/specifyweb/stored_queries/format.py +++ b/specifyweb/stored_queries/format.py @@ -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