From b8861ffc8e19c7c997fda75fa7352698d5cef180 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Tue, 2 Apr 2024 09:31:31 -0500 Subject: [PATCH] Add group number support in Taxon queries Fixes #4723 --- .../frontend/js_src/lib/components/WbPlanView/navigator.ts | 2 +- specifyweb/stored_queries/queryfieldspec.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specifyweb/frontend/js_src/lib/components/WbPlanView/navigator.ts b/specifyweb/frontend/js_src/lib/components/WbPlanView/navigator.ts index 782d3ca87fe..fdcc81cb4e9 100644 --- a/specifyweb/frontend/js_src/lib/components/WbPlanView/navigator.ts +++ b/specifyweb/frontend/js_src/lib/components/WbPlanView/navigator.ts @@ -177,7 +177,7 @@ export type MappingLineData = Pick< readonly defaultValue: string; }; -const queryBuilderTreeFields = new Set(['fullName', 'author']); +const queryBuilderTreeFields = new Set(['fullName', 'author', 'groupNumber']); /** * Get data required to build a mapping line from a source mapping path diff --git a/specifyweb/stored_queries/queryfieldspec.py b/specifyweb/stored_queries/queryfieldspec.py index 7f7808b3166..967839722a5 100644 --- a/specifyweb/stored_queries/queryfieldspec.py +++ b/specifyweb/stored_queries/queryfieldspec.py @@ -22,7 +22,7 @@ DATE_PART_RE = re.compile(r'(.*)((NumericDay)|(NumericMonth)|(NumericYear))$') # Pull out author or groupnumber field from taxon query fields. -TAXON_FIELD_RE = re.compile(r'(.*) ((Author)|(GroupNumber))$') +TAXON_FIELD_RE = re.compile(r'(.*) ((Author)|(groupNumber))$') # Look to see if we are dealing with a tree node ID. TREE_ID_FIELD_RE = re.compile(r'(.*) (ID)$')