Merge pull request #12040 from IQSS/compound-field-ordering

sekmiller · web-flow · commit fd755589088c · 2025-12-12T11:50:16.000-05:00
Add display order compound fields
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetField.java b/src/main/java/edu/harvard/iq/dataverse/DatasetField.java
@@ -172,6 +172,7 @@ public void setParentDatasetFieldCompoundValue(DatasetFieldCompoundValue parentD
     }
 
     @OneToMany(mappedBy = "parentDatasetField", orphanRemoval = true, cascade = {CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST})
+    @OrderBy("displayOrder ASC")
     private List<DatasetFieldCompoundValue> datasetFieldCompoundValues = new ArrayList<>();
 
     public List<DatasetFieldCompoundValue> getDatasetFieldCompoundValues() {

Original file line number	Diff line number	Diff line change
`@@ -172,6 +172,7 @@ public void setParentDatasetFieldCompoundValue(DatasetFieldCompoundValue parentD`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`@OneToMany(mappedBy = "parentDatasetField", orphanRemoval = true, cascade = {CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST})`
	`175`	`+ @OrderBy("displayOrder ASC")`
`175`	`176`	`private List<DatasetFieldCompoundValue> datasetFieldCompoundValues = new ArrayList<>();`
`176`	`177`
`177`	`178`	`public List<DatasetFieldCompoundValue> getDatasetFieldCompoundValues() {`