Merge pull request #8652 from IQSS/8456-upgrade-primefaces

8456 upgrade primefaces
IQSS · Apr 29, 2022 · 6b1b0cb · 6b1b0cb
2 parents c47cf82 + 175fa7b
commit 6b1b0cb
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 5 deletions.
diff --git a/doc/release-notes/8456-upgrade-primefaces.md b/doc/release-notes/8456-upgrade-primefaces.md
@@ -0,0 +1,4 @@
+### Primefaces 11
+
+Primefaces, the open source UI framework upon which the Dataverse front end is built, has been updated to the most recent version. This provides security updates and bug fixes and will also allow Dataverse developers to take advantage of new features and enhancements.
+
diff --git a/doc/sphinx-guides/source/_static/primefaces.css b/doc/sphinx-guides/source/_static/primefaces.css
diff --git a/doc/sphinx-guides/source/developers/debugging.rst b/doc/sphinx-guides/source/developers/debugging.rst
@@ -62,7 +62,7 @@ to maintain your settings more easily for different environments.
      - ``bootstrap``
 
 .. _Jakarta Server Faces 3.0 Spec: https://jakarta.ee/specifications/faces/3.0/jakarta-faces-3.0.html#a6088
-.. _PrimeFaces Configuration Docs: https://primefaces.github.io/primefaces/8_0/#/gettingstarted/configuration
+.. _PrimeFaces Configuration Docs: https://primefaces.github.io/primefaces/11_0_0/#/gettingstarted/configuration
 
 ----
 

diff --git a/pom.xml b/pom.xml
@@ -190,7 +190,7 @@
         <dependency>
             <groupId>org.primefaces</groupId>
             <artifactId>primefaces</artifactId>
-            <version>10.0.0</version>
+            <version>11.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.primefaces.themes</groupId>

diff --git a/src/main/java/edu/harvard/iq/dataverse/Template.java b/src/main/java/edu/harvard/iq/dataverse/Template.java
@@ -328,6 +328,7 @@ public Template cloneNewTemplate(Template source) {
            // terms.setLicense(TermsOfUseAndAccess.defaultLicense);
             terms.setFileAccessRequest(true);
         }
+        terms.setTemplate(newTemplate);
         newTemplate.setTermsOfUseAndAccess(terms);
         return newTemplate;
     }

diff --git a/src/main/webapp/manage-groups.xhtml b/src/main/webapp/manage-groups.xhtml
@@ -140,6 +140,7 @@
                         </div>
                         <p:dataTable id="groupMembers"
                                      var="groupMember"
+                                     rendered="#{manageGroupsPage.selectedGroup != null}"
                                      value="#{manageGroupsPage.getExplicitGroupMembers(manageGroupsPage.selectedGroup)}">
                             <!-- Member Name -->
                             <p:column width="31%"

diff --git a/src/main/webapp/manage-guestbooks.xhtml b/src/main/webapp/manage-guestbooks.xhtml
@@ -153,7 +153,7 @@
                             <span class="glyphicon glyphicon-warning-sign text-warning"/> <span class="text-warning">#{bundle['dataset.manageGuestbooks.tab.action.btn.delete.dialog.tip']}</span>
                         </p>
                         <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{manageGuestbooksPage.deleteGuestbook()}" update="@all"/>
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{manageGuestbooksPage.deleteGuestbook()}" update="@form,:messagePanel"/>
                             <button class="btn btn-link" onclick="PF('deleteConfirmation').hide();" type="button">
                                 #{bundle.cancel}
                             </button>

diff --git a/src/main/webapp/manage-templates.xhtml b/src/main/webapp/manage-templates.xhtml
@@ -156,7 +156,7 @@
                             </ul>
                         </ui:fragment>
                         <div class="button-block">
-                            <p:commandButton id="contDeleteTemplateBtn" styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{manageTemplatesPage.deleteTemplate()}" update="@all"/>
+                            <p:commandButton id="contDeleteTemplateBtn" styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{manageTemplatesPage.deleteTemplate()}" update="@form,:messagePanel"/>
                             <button class="btn btn-link" onclick="PF('deleteConfirmation').hide();" type="button">
                                 #{bundle.cancel}
                             </button>