Merge pull request #6059 from specify/issue-6042

Add Tectonic Unit paleoContexts relationship to the datamodel
specify · Jan 13, 2025 · f1aa17c · f1aa17c
2 parents 27476ea + 37d5d28
commit f1aa17c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/specifyweb/frontend/js_src/lib/components/DataModel/types.ts b/specifyweb/frontend/js_src/lib/components/DataModel/types.ts
@@ -6809,5 +6809,8 @@ export type TectonicUnit = {
     readonly parent: TectonicUnit;
   };
   readonly toManyDependent: RR<never, never>;
-  readonly toManyIndependent: { readonly acceptedChildren: RA<TectonicUnit> };
+  readonly toManyIndependent: {
+    readonly acceptedChildren: RA<TectonicUnit>;
+    readonly paleoContexts: RA<PaleoContext>;
+  };
 };
diff --git a/specifyweb/frontend/js_src/lib/components/QueryComboBox/index.tsx b/specifyweb/frontend/js_src/lib/components/QueryComboBox/index.tsx
@@ -489,7 +489,7 @@ export function QueryComboBox({
                 }
               />
             )}
-            {hasSearchButton && (
+            {hasSearchButton && !field.isDependent() && (
               <DataEntry.Search
                 aria-pressed={state.type === 'SearchState'}
                 onClick={

diff --git a/specifyweb/specify/datamodel.py b/specifyweb/specify/datamodel.py
@@ -8701,6 +8701,7 @@
             Relationship(name='parent', type='many-to-one', required=True, relatedModelName='TectonicUnit', column='ParentID'),
             Relationship(name='definition', type='many-to-one', required=True, relatedModelName='TectonicUnitTreeDef', column='TectonicUnitTreeDefID', otherSideName='treeEntries'),
             Relationship(name='definitionItem', type='many-to-one', required=True, relatedModelName='TectonicUnitTreeDefItem', column='TectonicUnitTreeDefItemID', otherSideName='treeEntries'),
+            Relationship(name='paleoContexts', type='one-to-many',required=False, relatedModelName='PaleoContext', otherSideName='tectonicUnit'),
         ],
         fieldAliases=[
             {'vname':'acceptedParent', 'aname':'acceptedTectonicUnit'}