diff --git a/src/main/java/edu/harvard/iq/dataverse/LicenseServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/LicenseServiceBean.java index 7fea2a785a4..725fb124824 100644 --- a/src/main/java/edu/harvard/iq/dataverse/LicenseServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/LicenseServiceBean.java @@ -89,7 +89,7 @@ public License save(License license) throws RequestBodyException, ConflictExcept return license; } - public void setById(long id, String name, URI uri, URI iconUrl, boolean active) throws UpdateException { + public void setById(long id, String name, String shortDescription, URI uri, URI iconUrl, boolean active) throws UpdateException { List licenses = em.createNamedQuery("License.findById", License.class) .setParameter("id", id ) .getResultList(); @@ -97,6 +97,7 @@ public void setById(long id, String name, URI uri, URI iconUrl, boolean active) if(licenses.size() > 0) { License license = licenses.get(0); license.setName(name); + license.setShortDescription(shortDescription); license.setUri(uri); license.setIconUrl(iconUrl); license.setActive(active); diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Admin.java b/src/main/java/edu/harvard/iq/dataverse/api/Admin.java index 114c3cbf88d..e24978c86a1 100644 --- a/src/main/java/edu/harvard/iq/dataverse/api/Admin.java +++ b/src/main/java/edu/harvard/iq/dataverse/api/Admin.java @@ -2025,7 +2025,7 @@ public Response setDefault(long id) { @Path("/licenses/{id}") public Response putLicenseById(@PathParam("id") long id, License license) { try { - licenseService.setById(id, license.getName(), license.getUri(), license.getIconUrl(), license.isActive()); + licenseService.setById(id, license.getName(), license.getShortDescription(), license.getUri(), license.getIconUrl(), license.isActive()); } catch (UpdateException e) { return error(Response.Status.BAD_REQUEST, e.getMessage()); } diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java index c1c0463e668..08e425b6b0a 100644 --- a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java +++ b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java @@ -783,6 +783,7 @@ public static JsonObjectBuilder json(License license) { return jsonObjectBuilder() .add("id", license.getId()) .add("name", license.getName()) + .add("shortDescription", license.getShortDescription()) .add("uri", license.getUri().toString()) .add("iconUrl", license.getIconUrl().toString()) .add("active", license.isActive()); diff --git a/src/main/webapp/dataset-license-terms.xhtml b/src/main/webapp/dataset-license-terms.xhtml index 7b6ace1afbd..87049f519a2 100644 --- a/src/main/webapp/dataset-license-terms.xhtml +++ b/src/main/webapp/dataset-license-terms.xhtml @@ -50,14 +50,15 @@

- #{bundle['file.icon.alttxt']} - #{termsOfUseAndAccess.license.name} + #{bundle['file.icon.alttxt']} + #{termsOfUseAndAccess.license.name}

+
-

- #{bundle['file.icon.alttxt']} - #{DatasetPage.getSelectedLicenseById().name} +

+ #{bundle['file.icon.alttxt']} + #{DatasetPage.getSelectedLicenseById().name}

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml index 3f130f406a4..31f5b820bcc 100644 --- a/src/main/webapp/dataset.xhtml +++ b/src/main/webapp/dataset.xhtml @@ -606,8 +606,8 @@

- #{bundle['file.icon.alttxt']} - #{DatasetPage.workingVersion.termsOfUseAndAccess.license.name} + #{bundle['file.icon.alttxt']} + #{DatasetPage.workingVersion.termsOfUseAndAccess.license.name}