bugfix: advanced DatasetFieldType displayOrder comparison

TIK-NFL · Aug 7, 2024 · a57719f · a57719f
1 parent f093280
commit a57719f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java
@@ -517,7 +517,11 @@ public void setDatasetFieldDefaultValues(List<DatasetFieldDefaultValue> datasetF
 
     @Override
     public int compareTo(DatasetFieldType o) {
-        return Integer.compare(this.getDisplayOrder(), (o.getDisplayOrder()));
+        int result = Integer.compare(this.getDisplayOrder(), (o.getDisplayOrder()));
+        if(!this.isHasParent() && o.isChild() && result == 0) {
+            result = -1;
+        }
+        return result;
     }
 
     public String getDisplayName() {