Merge pull request #78 from mderuijter/filter-inactive-licenses-from-…

…dropdown-list DD-482 Filter inactive licenses from dropdown list
uncch-rdmc · Jun 1, 2021 · 8f1969c · 8f1969c
2 parents 71f6be2 + 55bd5a1
commit 8f1969c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -2049,7 +2049,7 @@ private String init(boolean initFull) {
         previewTools = externalToolService.findFileToolsByType(ExternalTool.Type.PREVIEW);
         datasetExploreTools = externalToolService.findDatasetToolsByType(ExternalTool.Type.EXPLORE);
         rowsPerPage = 10;
-        licenseSelectItems = licenseServiceBean.listAll().stream()
+        licenseSelectItems = licenseServiceBean.listAllActive().stream()
                                                              .map(license -> new SelectItem(license.getId().toString(), license.getName()))
                                                              .collect(Collectors.toList());
 

diff --git a/src/main/java/edu/harvard/iq/dataverse/License.java b/src/main/java/edu/harvard/iq/dataverse/License.java
@@ -20,7 +20,9 @@
  */
  @NamedQueries({
     @NamedQuery( name="License.findAll",
-                query="SELECT l FROM License l"),
+            query="SELECT l FROM License l"),
+    @NamedQuery( name="License.findAllActive",
+            query="SELECT l FROM License l WHERE l.active='true'"),
     @NamedQuery( name="License.findById",
             query = "SELECT l FROM License l WHERE l.id=:id"),
     @NamedQuery( name="License.findByName",

diff --git a/src/main/java/edu/harvard/iq/dataverse/LicenseServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/LicenseServiceBean.java
@@ -32,6 +32,10 @@ public List<License> listAll() {
         return em.createNamedQuery("License.findAll", License.class).getResultList();
     }
 
+    public List<License> listAllActive() {
+        return em.createNamedQuery("License.findAllActive", License.class).getResultList();
+    }
+
     public License getById(Long id) throws FetchException {
         List<License> licenses = em.createNamedQuery("License.findById", License.class)
                 .setParameter("id", id )