Merge pull request #6047 from specify/issue-6040

Add id in empty child COJO condition to avoid subview to disappear
specify · Jan 8, 2025 · 3790744 · 3790744
2 parents cfd2dfa + e3f6088
commit 3790744
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -87,6 +87,7 @@ jobs:
             GIT_SHA=${{ github.sha }}
           tags: ${{ steps.prep.outputs.tags }}
           push: true
+          retries: 3
 
       - name: Export digest
         run: |

diff --git a/config/common/common.views.xml b/config/common/common.views.xml
@@ -1984,7 +1984,7 @@
 								<cell type="field" id="locality" name="childCo.collectingEvent.locality.localityName" uitype="text" readonly="true"/>
 							</row>
 						</rows>
-						<rows condition="childCO=_EMPTY">
+						<rows condition="childCO.id=_EMPTY">
 							<row/>
 						</rows>
 					</cell>
@@ -2003,7 +2003,7 @@
 								<cell type="field" id="typeOfGroup" name="childCog.COGType.Name" uitype="text" readonly="true"/>
 							</row>
 						</rows>
-						<rows condition="childCOG=_EMPTY">
+						<rows condition="childCOG.id=_EMPTY">
 							<row/>
 						</rows>
 					</cell>
@@ -2015,7 +2015,7 @@
 								<cell type="subview" viewname="CollectionObjectMini" id="childCO" name="childCo" uitype="subview" colspan="20"/>
 							</row>
 						</rows>
-						<rows condition="childCo=_EMPTY">
+						<rows condition="childCO.id=_EMPTY">
 							<row/>
 							<!-- Show nothing if no Collection Object Group (COG) or Collection Object (CO) child exists for this COJO record -->
 						</rows>
@@ -2028,7 +2028,7 @@
 								<cell type="subview" viewname="CollectionObjectGroup" id="childCog" name="childCog" colspan="20"/>
 							</row>
 						</rows>
-						<rows condition="childcog=_EMPTY">
+						<rows condition="childCOG.id=_EMPTY">
 							<row/>
 							<!-- Show nothing if no Collection Object Group (COG) or Collection Object (CO) child exists for this COJO record -->
 						</rows>