Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8456 upgrade primefaces #8652

Merged
merged 11 commits into from
Apr 29, 2022
4 changes: 4 additions & 0 deletions doc/release-notes/8456-upgrade-primefaces.md
Original file line number Diff line number Diff line change
@@ -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.

2 changes: 1 addition & 1 deletion doc/sphinx-guides/source/_static/primefaces.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion doc/sphinx-guides/source/developers/debugging.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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

----

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions src/main/java/edu/harvard/iq/dataverse/Template.java
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,7 @@ public Template cloneNewTemplate(Template source) {
// terms.setLicense(TermsOfUseAndAccess.defaultLicense);
terms.setFileAccessRequest(true);
}
terms.setTemplate(newTemplate);
newTemplate.setTermsOfUseAndAccess(terms);
return newTemplate;
}
Expand Down
1 change: 1 addition & 0 deletions src/main/webapp/manage-groups.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -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%"
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/manage-guestbooks.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/manage-templates.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down