Merge pull request #8567 from Kris-LIBIS/8554-license-sorting-option2

Fix sorting order of licenses by id with default license at the top
IQSS · Apr 8, 2022 · 1688a28 · 1688a28
2 parents 3669666 + 30f3b27
commit 1688a28
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/license/License.java b/src/main/java/edu/harvard/iq/dataverse/license/License.java
@@ -23,9 +23,9 @@
  */
  @NamedQueries({
     @NamedQuery( name="License.findAll",
-            query="SELECT l FROM License l"),
+            query="SELECT l FROM License l ORDER BY (case when l.isDefault then 0 else 1 end), l.id asc"),
     @NamedQuery( name="License.findAllActive",
-            query="SELECT l FROM License l WHERE l.active='true'"),
+            query="SELECT l FROM License l WHERE l.active='true' ORDER BY (case when l.isDefault then 0 else 1 end), l.id asc"),
     @NamedQuery( name="License.findById",
             query = "SELECT l FROM License l WHERE l.id=:id"),
     @NamedQuery( name="License.findDefault",