From 974147572e13604475a1a8650849d118979ce818 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Thu, 5 Dec 2024 11:51:34 -0600 Subject: [PATCH 1/6] Make `isPrimary` and `isSubstrate` read only --- config/common/common.views.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/common/common.views.xml b/config/common/common.views.xml index 3ccd4103cac..028a1675233 100644 --- a/config/common/common.views.xml +++ b/config/common/common.views.xml @@ -7181,9 +7181,9 @@ - + - + From 102f3a31e79bc07e5d480fc21af63aee621d6817 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Mon, 9 Dec 2024 10:12:09 -0600 Subject: [PATCH 2/6] Add TectonicUnit to TypeSearches --- config/backstop/typesearch_def.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/backstop/typesearch_def.xml b/config/backstop/typesearch_def.xml index bc73b3d2e32..0929074f8f9 100644 --- a/config/backstop/typesearch_def.xml +++ b/config/backstop/typesearch_def.xml @@ -69,6 +69,6 @@ - - - + + + \ No newline at end of file From 7edbacb2b9b5c0480adad599a5a96fc01616999e Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Mon, 9 Dec 2024 10:13:33 -0600 Subject: [PATCH 3/6] Fix TectonicUnit looking at Taxon --- config/backstop/global.views.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/backstop/global.views.xml b/config/backstop/global.views.xml index a2429e00b29..4c006b625b3 100644 --- a/config/backstop/global.views.xml +++ b/config/backstop/global.views.xml @@ -2858,7 +2858,7 @@ - + From 457b8175103e988da3ae2f38e22e0afcb2946e52 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Wed, 11 Dec 2024 15:04:22 -0600 Subject: [PATCH 4/6] Update geology.views.xml --- config/geology/geology.views.xml | 324 ++++++++++++++++--------------- 1 file changed, 166 insertions(+), 158 deletions(-) diff --git a/config/geology/geology.views.xml b/config/geology/geology.views.xml index 6d2839c9b59..8f9f31fe58a 100644 --- a/config/geology/geology.views.xml +++ b/config/geology/geology.views.xml @@ -74,29 +74,22 @@ Subform within the Collection Object form. - - + + Subform within the Collection Object form. - - + + Subform within the Collection Object form. - - - - - - Subform within the Collection Object form. - - - + + @@ -113,6 +106,13 @@ + + Subform within the Collection Object form. + + + + + @@ -129,8 +129,8 @@ - - + + @@ -140,25 +140,6 @@ - @@ -168,6 +149,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -393,7 +401,7 @@ - + @@ -407,10 +415,10 @@ - + @@ -750,7 +758,7 @@ - + Form For OtherIdentifier 100px,2px,115px,5px,75px,2px,115px,5px,109px,2px,115px,5px,60px,2px,115px,0px,p:g 115px,2px,120px,5px,95px,2px,120px,5px,130px,2px,120px,5px,74px,2px,120px,0px,p:g @@ -938,7 +946,7 @@ --> - + Form For OtherIdentifier 100px,2px,115px,5px,75px,2px,115px,5px,109px,2px,115px,5px,60px,2px,115px,0px,p:g 115px,2px,120px,5px,95px,2px,120px,5px,130px,2px,120px,5px,74px,2px,120px,0px,p:g @@ -1125,7 +1133,7 @@ --> - + Form For OtherIdentifier 100px,2px,115px,5px,75px,2px,115px,5px,109px,2px,115px,5px,60px,2px,115px,0px,p:g 115px,2px,120px,5px,95px,2px,120px,5px,130px,2px,120px,5px,74px,2px,120px,0px,p:g @@ -1141,120 +1149,6 @@ - - Form For OtherIdentifier - 100px,2px,115px,5px,75px,2px,115px,5px,109px,2px,115px,5px,60px,2px,115px,0px,p:g - 115px,2px,120px,5px,95px,2px,120px,5px,130px,2px,120px,5px,74px,2px,120px,0px,p:g - 130px,2px,140px,5px,95px,2px,140px,5px,135px,2px,140px,5px,84px,2px,145px,0px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),0px - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Collecting Event 100px,2px,200px,5px,90px,2px,210px,5px,96px,2px,115px,0px,15px,p:g @@ -1283,6 +1177,10 @@ + + + + @@ -1299,10 +1197,6 @@ - - - - + + \ No newline at end of file From d9f965924e918832c46b629b40bce299e3810a65 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Wed, 11 Dec 2024 15:08:06 -0600 Subject: [PATCH 5/6] Add COG subview, remove `parentCog` field --- config/common/common.views.xml | 58 ++++++++++++++++++++++++++------ config/geology/geology.views.xml | 7 ++-- 2 files changed, 53 insertions(+), 12 deletions(-) diff --git a/config/common/common.views.xml b/config/common/common.views.xml index 028a1675233..91b77fcbd07 100644 --- a/config/common/common.views.xml +++ b/config/common/common.views.xml @@ -952,8 +952,17 @@ The Collection Object Group Join form. - - + + + + + + The Collection Object Group Join form. + + + + + @@ -1920,11 +1929,12 @@ - - - + + + + @@ -6901,7 +6911,7 @@ - + @@ -7032,6 +7042,14 @@ + + + + + + + + @@ -7044,7 +7062,7 @@ - + @@ -7071,8 +7089,8 @@ - - + @@ -7173,7 +7191,7 @@ The Collection Object Group Join Form Grid View CollectionObjectGroupJoin (2) - + The Collection Object Group Join Form 50px,2px,30px,5px,50px,2px,30px,5px,50px,2px,100px,0px,50px,2px,100px,p:g @@ -7203,5 +7221,25 @@ + + The Collection Object Group Join Form + + 70px,2px,30px,5px,70px,2px,30px,2px,70px,2px,500px,,p:g + + + + + + + + + + + + + + The Collection Object Group Join Form Grid View + CollectionObjectGroupJoin (2) + \ No newline at end of file diff --git a/config/geology/geology.views.xml b/config/geology/geology.views.xml index 8f9f31fe58a..0ca5efaf96f 100644 --- a/config/geology/geology.views.xml +++ b/config/geology/geology.views.xml @@ -129,8 +129,8 @@ - - + + @@ -140,6 +140,9 @@ + + + From 2a87af18aa9c5e79ee763a609d1556df259dc321 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Thu, 12 Dec 2024 10:25:43 -0600 Subject: [PATCH 6/6] Fix missing definition --- config/common/common.views.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/common/common.views.xml b/config/common/common.views.xml index 3b0ce46a41c..f4687f7b3d3 100644 --- a/config/common/common.views.xml +++ b/config/common/common.views.xml @@ -7191,7 +7191,7 @@ The Collection Object Group Join Form Grid View - CollectionObjectGroupJoin (2) + CollectionObjectGroupJoin_GridView The Collection Object Group Join Form @@ -7241,7 +7241,7 @@ The Collection Object Group Join Form Grid View - CollectionObjectGroupJoin (2) + CollectionObjectGroupJoin_GridView \ No newline at end of file