Merge pull request #81 from mderuijter/dd-485-update-license-logo-and…

…-description-on-dropdown-change DD-485 update license logo and description on dropdown change
uncch-rdmc · Jun 8, 2021 · b1fb21f · b1fb21f
2 parents 7dbd78d + 832e4f6
commit b1fb21f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -349,6 +349,15 @@ public void setLicenseId(Long licenseId) {
         this.licenseId = licenseId;
     }
 
+    public License getSelectedLicenseById(){
+        try {
+            return licenseServiceBean.getById(licenseId);
+        } catch (FetchException e) {
+            logger.log(Level.SEVERE,"Exception: " + e.getMessage());
+        }
+        return null;
+    }
+
     // TODO: Consider renaming "configureTools" to "fileConfigureTools".
     List<ExternalTool> configureTools = new ArrayList<>();
     // TODO: Consider renaming "exploreTools" to "fileExploreTools".

diff --git a/src/main/webapp/dataset-license-terms.xhtml b/src/main/webapp/dataset-license-terms.xhtml
@@ -49,10 +49,16 @@
                                        <p:ajax update="touFragment" oncomplete="javascript:bind_bsui_components();" />
                                    </p:selectOneMenu>
                                </ui:fragment>
-                               <ui:fragment rendered="#{!empty termsOfUseAndAccess.license}">
-                                   <p>
-                                       <img src="#{termsOfUseAndAccess.license.iconUrl}" alt="#{bundle['file.icon.alttxt']}" width="15%" height="15%"/>
-                                       <a href="#{termsOfUseAndAccess.license.uri}">#{termsOfUseAndAccess.license.name}</a>
+                               <ui:fragment rendered="#{!empty termsOfUseAndAccess.license and empty DatasetPage.licenseId and empty editMode}">
+                                       <p>
+                                           <img src="#{termsOfUseAndAccess.license.iconUrl}" alt="#{bundle['file.icon.alttxt']}" width="15%" height="15%"/>
+                                           <a href="#{termsOfUseAndAccess.license.uri}">#{termsOfUseAndAccess.license.name}</a>
+                                       </p>
+                               </ui:fragment>
+                               <ui:fragment rendered="#{!empty DatasetPage.licenseId}">
+                                   <p >
+                                       <img src="#{DatasetPage.getSelectedLicenseById().iconUrl}" alt="#{bundle['file.icon.alttxt']}" width="15%" height="15%"/>
+                                       <a href="#{DatasetPage.getSelectedLicenseById().uri}">#{DatasetPage.getSelectedLicenseById().name}</a>
                                    </p>
                                </ui:fragment>
                            </div>