From 55bd5a1e25d48de2a549638046e4588bcc5734cc Mon Sep 17 00:00:00 2001 From: mderuijter Date: Mon, 31 May 2021 16:12:14 +0200 Subject: [PATCH] retrieve active licenses only for dropdown list --- src/main/java/edu/harvard/iq/dataverse/DatasetPage.java | 2 +- src/main/java/edu/harvard/iq/dataverse/License.java | 4 +++- .../java/edu/harvard/iq/dataverse/LicenseServiceBean.java | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java index 74df80fb9cf..ba803c536a7 100644 --- 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 index 98a6ad86d5d..a661855eff1 100644 --- 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 index 5f14793d096..27c54effb6a 100644 --- 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 listAll() { return em.createNamedQuery("License.findAll", License.class).getResultList(); } + public List listAllActive() { + return em.createNamedQuery("License.findAllActive", License.class).getResultList(); + } + public License getById(Long id) throws FetchException { List licenses = em.createNamedQuery("License.findById", License.class) .setParameter("id", id )