From b4df3f815b9d670ebaf5b9c9ec2bc769ff3086e2 Mon Sep 17 00:00:00 2001 From: Stephen Kraffmiller Date: Thu, 21 Apr 2022 09:11:14 -0400 Subject: [PATCH 1/6] #8456 primefaces upgrade --- doc/sphinx-guides/source/_static/primefaces.css | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/sphinx-guides/source/_static/primefaces.css b/doc/sphinx-guides/source/_static/primefaces.css index d03f2c1ef19..2d8a8510d84 100644 --- a/doc/sphinx-guides/source/_static/primefaces.css +++ b/doc/sphinx-guides/source/_static/primefaces.css @@ -1,6 +1,6 @@ /*!* jQuery UI CSS Framework 1.8.20** Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)* Dual licensed under the MIT or GPL Version 2 licenses.* http://jquery.org/license** http://docs.jquery.com/UI/Theming/API*//* Layout helpers----------------------------------*/.ui-helper-hidden{display:none;}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:0px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:0px;}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none;}.ui-helper-clearfix:after{content:".";display:block;height:0;clear:both;visibility:hidden;}.ui-helper-clearfix{display:inline-block;}/* required comment for clearfix to work in Opera \*/* html .ui-helper-clearfix{height:1%;}.ui-helper-clearfix{display:block;}/* end clearfix */.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0);}/* Interaction Cues----------------------------------*/.ui-state-disabled{cursor:default !important;}/* Icons----------------------------------*//* states and images */.ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat;}/* Misc visuals----------------------------------*//* Overlays */.ui-widget-overlay{position:absolute;top:0;left:0;width:100%;height:100%;}/*!* jQuery UI Resizable 1.8.20** Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)* Dual licensed under the MIT or GPL Version 2 licenses.* http://jquery.org/license** http://docs.jquery.com/UI/Resizable#theming*/.ui-resizable{position:relative;}.ui-resizable-handle{position:absolute;font-size:0.1px;display:block;}.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle{display:none;}.ui-resizable-n{cursor:n-resize;height:7px;width:100%;top:-5px;left:0;}.ui-resizable-s{cursor:s-resize;height:7px;width:100%;bottom:-5px;left:0;}.ui-resizable-e{cursor:e-resize;width:7px;right:-5px;top:0;height:100%;}.ui-resizable-w{cursor:w-resize;width:7px;left:-5px;top:0;height:100%;}.ui-resizable-se{cursor:se-resize;width:12px;height:12px;right:1px;bottom:1px;}.ui-resizable-sw{cursor:sw-resize;width:9px;height:9px;left:-5px;bottom:-5px;}.ui-resizable-nw{cursor:nw-resize;width:9px;height:9px;left:-5px;top:-5px;}.ui-resizable-ne{cursor:ne-resize;width:9px;height:9px;right:-5px;top:-5px;}/*!* jQuery UI Selectable 1.8.20** Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)* Dual licensed under the MIT or GPL Version 2 licenses.* http://jquery.org/license** http://docs.jquery.com/UI/Selectable#theming*/.ui-selectable-helper{position:absolute;z-index:100;border:1px dotted black;}/*!* jQuery UI Slider 1.8.20** Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)* Dual licensed under the MIT or GPL Version 2 licenses.* http://jquery.org/license** http://docs.jquery.com/UI/Slider#theming*/.ui-slider{position:relative;text-align:left;}.ui-slider .ui-slider-handle{position:absolute;z-index:2;width:1.2em;height:1.2em;cursor:default;}.ui-slider .ui-slider-range{position:absolute;z-index:1;font-size:.7em;display:block;border:0;background-position:0 0;}.ui-slider-horizontal{height:.8em;}.ui-slider-horizontal .ui-slider-handle{top:-.3em;margin-left:-.6em;}.ui-slider-horizontal .ui-slider-range{top:0;height:100%;}.ui-slider-horizontal .ui-slider-range-min{left:0;}.ui-slider-horizontal .ui-slider-range-max{right:0;}.ui-slider-vertical{width:.8em;height:100px;}.ui-slider-vertical .ui-slider-handle{left:-.3em;margin-left:0;margin-bottom:-.6em;}.ui-slider-vertical .ui-slider-range{left:0;width:100%;}.ui-slider-vertical .ui-slider-range-min{bottom:0;}.ui-slider-vertical .ui-slider-range-max{top:0;}/*!* jQuery UI Datepicker 1.8.20** Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)* Dual licensed under the MIT or GPL Version 2 licenses.* http://jquery.org/license** http://docs.jquery.com/UI/Datepicker#theming*/.ui-datepicker{width:17em;padding:.2em .2em 0;display:none;}.ui-datepicker .ui-datepicker-header{position:relative;padding:.2em 0;}.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next{position:absolute;top:2px;width:1.8em;height:1.8em;}.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover{top:1px;}.ui-datepicker .ui-datepicker-prev{left:2px;}.ui-datepicker .ui-datepicker-next{right:2px;}.ui-datepicker .ui-datepicker-prev-hover{left:1px;}.ui-datepicker .ui-datepicker-next-hover{right:1px;}.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span{display:block;position:absolute;left:50%;margin-left:-8px;top:50%;margin-top:-8px;}.ui-datepicker .ui-datepicker-title{margin:0 2.3em;line-height:1.8em;text-align:center;}.ui-datepicker .ui-datepicker-title select{font-size:1em;margin:1px 0;}.ui-datepicker select.ui-datepicker-month-year{width:100%;}.ui-datepicker select.ui-datepicker-month, .ui-datepicker select.ui-datepicker-year{width:49%;}.ui-datepicker table{width:100%;font-size:.9em;border-collapse:collapse;margin:0 0 .4em;}.ui-datepicker th{padding:.7em .3em;text-align:center;font-weight:bold;border:0;}.ui-datepicker td{border:0;padding:1px;}.ui-datepicker td span, .ui-datepicker td a{display:block;padding:.2em;text-align:right;text-decoration:none;}.ui-datepicker .ui-datepicker-buttonpane{background-image:none;margin:.7em 0 0 0;padding:0 .2em;border-left:0;border-right:0;border-bottom:0;}.ui-datepicker .ui-datepicker-buttonpane button{float:right;margin:.5em .2em .4em;cursor:pointer;padding:.2em .6em .3em .6em;width:auto;overflow:visible;}.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current{float:left;}/* with multiple calendars */.ui-datepicker.ui-datepicker-multi{width:auto;}.ui-datepicker-multi .ui-datepicker-group{float:left;}.ui-datepicker-multi .ui-datepicker-group table{width:95%;margin:0 auto .4em;}.ui-datepicker-multi-2 .ui-datepicker-group{width:50%;}.ui-datepicker-multi-3 .ui-datepicker-group{width:33.3%;}.ui-datepicker-multi-4 .ui-datepicker-group{width:25%;}.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header{border-left-width:0;}.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header{border-left-width:0;}.ui-datepicker-multi .ui-datepicker-buttonpane{clear:left;}.ui-datepicker-row-break{clear:both;width:100%;font-size:0em;}/* RTL support */.ui-datepicker-rtl{direction:rtl;}.ui-datepicker-rtl .ui-datepicker-prev{right:2px;left:auto;}.ui-datepicker-rtl .ui-datepicker-next{left:2px;right:auto;}.ui-datepicker-rtl .ui-datepicker-prev:hover{right:1px;left:auto;}.ui-datepicker-rtl .ui-datepicker-next:hover{left:1px;right:auto;}.ui-datepicker-rtl .ui-datepicker-buttonpane{clear:right;}.ui-datepicker-rtl .ui-datepicker-buttonpane button{float:left;}.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current{float:right;}.ui-datepicker-rtl .ui-datepicker-group{float:right;}.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header{border-right-width:0;border-left-width:1px;}.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header{border-right-width:0;border-left-width:1px;}/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */.ui-datepicker-cover{display:none;/*sorry for IE5*/display/**/:block;/*sorry for IE5*/position:absolute;/*must have*/z-index:-1;/*must have*/filter:mask();/*must have*/top:-4px;/*must have*/left:-4px;/*must have*/width:200px;/*must have*/height:200px;/*must have*/}/* css for timepicker */.ui-timepicker-div .ui-widget-header{margin-bottom:8px;}.ui-timepicker-div dl{text-align:left;}.ui-timepicker-div dl dt{height:25px;margin-bottom:-25px;}.ui-timepicker-div dl dd{margin:0 10px 10px 65px;}.ui-timepicker-div td{font-size:90%;}.ui-tpicker-grid-label{background:none;border:none;margin:0;padding:0;}.ui-timepicker-rtl{direction:rtl;}.ui-timepicker-rtl dl{text-align:right;}.ui-timepicker-rtl dl dd{margin:0 65px 10px 10px;}/* PrimeFaces Extensions */.ui-datepicker-trigger.ui-button-icon-only .ui-button-text{padding:0.3em;} .ui-accordion .ui-accordion-header{cursor:pointer;position:relative;margin-top:1px;min-height:0;padding:.5em .5em .5em 2.2em;}.ui-accordion .ui-accordion-header .ui-icon{position:absolute;left:.5em;top:50%;margin-top:-8px;}.ui-accordion .ui-accordion-content{padding:1em 2.2em;border-top:0;margin-top:-2px;position:relative;top:1px;margin-bottom:2px;overflow:auto;zoom:1;}.ui-accordion .ui-accordion-header.ui-state-disabled, .ui-accordion .ui-accordion-header.ui-state-disabled a{cursor:default;}/** RTL **/.ui-accordion.ui-accordion-rtl{direction:rtl;}.ui-accordion.ui-accordion-rtl .ui-accordion-header .ui-icon{right:0.5m;left:auto;}.ui-accordion.ui-accordion-rtl .ui-accordion-header a{padding:0.5em 2.2em 0.5em 0.5em;}.ui-tabs-outline{outline:dotted thin;z-index:1;} -.ui-autocomplete{width:auto;zoom:1;cursor:pointer;-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;position:relative;display:inline-block;}.ui-autocomplete .ui-autocomplete-dropdown{position:absolute;height:100%;width:2.4em;}.ui-autocomplete-query{font-weight:bold;}.ui-autocomplete-panel{position:absolute;overflow:auto;}.ui-autocomplete-panel .ui-autocomplete-item{cursor:pointer;}.ui-autocomplete-panel .ui-autocomplete-list{padding:0.4em;border:0 none;}.ui-autocomplete-panel .ui-autocomplete-list-item{border:0px none;font-weight:normal;margin:1px 0;padding:3px 5px;text-align:left;}.ui-autocomplete-panel .ui-autocomplete-table{border-collapse:collapse;width:100%;}.ui-autocomplete-panel .ui-autocomplete-table th,.ui-autocomplete-panel .ui-autocomplete-table td{border-width:1px;border-style:solid;border-color:inherit;padding:4px 10px 4px 10px;}.ui-autocomplete .ui-button-icon-only .ui-button-text{padding:0.29em;}/* Multiple Selection */.ui-autocomplete-multiple-container{clear:left;cursor:text;list-style-type:none;margin:0;min-height:1px;overflow:hidden;width:400px;}.ui-autocomplete-multiple-container.ui-inputfield{padding:0;}.ui-autocomplete-token{cursor:default;float:left;overflow:hidden;padding:1px 3px;white-space:nowrap;position:relative;margin:2px;}.ui-autocomplete-token-label{display:block;padding:0em 2.1em 0em 0.5em;}.ui-autocomplete-token-icon{margin-top:-9px;position:absolute;right:0.2em;top:50%;cursor:pointer;}.ui-autocomplete-input-token{float:left;list-style-type:none;margin:1px;padding:0;}.ui-autocomplete-input-token input{border:0 none;width:140px;outline:medium none;background-color:transparent;margin:2px;}.ui-autocomplete-itemtip-content{display:none;}.ui-autocomplete-itemtip{position:absolute;display:none;padding:0.4em;}.ui-autocomplete-emptyMessage{padding:3px 5px;}.ui-autocomplete-panel .ui-autocomplete-group{font-weight:bold;cursor:default;} +.ui-autocomplete{width:auto;zoom:1;cursor:pointer;-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;position:relative;display:inline-block;}.ui-autocomplete .ui-autocomplete-dropdown{position:absolute;height:100%;width:2.4em;}.ui-autocomplete-query{font-weight:bold;}.ui-autocomplete-panel{position:absolute;overflow:auto;}.ui-autocomplete-panel .ui-autocomplete-item{cursor:pointer;}.ui-autocomplete-panel .ui-autocomplete-list{padding:0.4em;border:0 none;}.ui-autocomplete-panel .ui-autocomplete-list-item{border:0px none;font-weight:normal;margin:1px 0;padding:3px 5px;text-align:left;}.ui-autocomplete-panel .ui-autocomplete-table{border-collapse:collapse;width:100%;}.ui-autocomplete-panel .ui-autocomplete-table th,.ui-autocomplete-panel .ui-autocomplete-table td{border-width:1px;border-style:solid;border-color:inherit;padding:4px 10px 4px 10px;}.ui-autocomplete .ui-button-icon-only .ui-button-text{padding:0.29em;}/* Multiple Selection */.ui-autocomplete-multiple-container{clear:left;cursor:text;list-style-type:none;margin:0;min-height:1px;overflow:hidden;width:400px;}.ui-autocomplete-multiple-container.ui-inputfield{padding:0;}.ui-autocomplete-token{cursor:default;float:left;overflow:hidden;padding:1px 3px;white-space:nowrap;position:relative;margin:2px;}.ui-autocomplete-token-label{display:block;padding:0em 2.1em 0em 0.5em;}.ui-autocomplete-token-icon{margin-top:-9px;position:absolute;right:0.2em;top:50%;cursor:pointer;}.ui-autocomplete-input-token{float:left;list-style-type:none;margin:1px;padding:0;}.ui-autocomplete-input-token input{border:0 none;width:140px;outline:medium none;background-color:transparent;margin:2px;}.ui-autocomplete-itemtip-content{display:none;}.ui-autocomplete-itemtip{position:absolute;display:none;padding:0.4em;}.ui-autocomplete-empty-message{padding:3px 5px;}.ui-autocomplete-panel .ui-autocomplete-group{font-weight:bold;cursor:default;} .ui-blockui{position:absolute;top:0;left:0;text-align:center;width:100%;height:100%;}.ui-blockui-content{position:absolute;text-align:center;padding:1em;} .ui-carousel{position:relative;padding:1px;}.ui-carousel .ui-carousel-viewport .ui-carousel-items{list-style:none outside none;margin:0;padding:0;position:relative;width:32000px;left:0;}.ui-carousel .ui-carousel-viewport .ui-carousel-items .ui-carousel-item{margin:1px;padding:0;float:left;}.ui-carousel .ui-carousel-viewport{overflow:hidden;position:relative;border:0;}.ui-carousel .ui-carousel-footer{margin:1px 1px 0px 1px;padding-top:9px;padding-bottom:6px;padding-right:10px;padding-left:10px;overflow:hidden;}.ui-carousel .ui-carousel-header{margin:0 1px;overflow:hidden;padding-top:7px;padding-bottom:8px;padding-right:10px;padding-left:10px;}.ui-carousel .ui-carousel-header .ui-carousel-header-title{display:inline-block;width:30%;padding-top:2px;overflow:hidden;}.ui-carousel .ui-carousel-dropdown,.ui-carousel .ui-carousel-mobiledropdown{float:right;margin:0px 10px;background-image:none;}.ui-carousel .ui-carousel-dropdown option,.ui-carousel .ui-carousel-mobiledropdown option{background-image:none;border:0 none;box-shadow:none;-moz-box-shadow:none;-webkit-box-shadow:none;}.ui-carousel .ui-carousel-button{float:right;margin:2px;}.ui-carousel .ui-carousel-page-link{float:left;margin:0 2px;}.ui-carousel .ui-carousel-page-link, .ui-carousel .ui-carousel-button{cursor:pointer;}.ui-carousel .ui-carousel-page-links{margin:0px 9px;margin-top:1px;display:inline-table;float:right;}.ui-carousel .ui-carousel-mobiledropdown{display:none;} .ui-columntoggler{padding:0;position:absolute;overflow:auto;display:none;}.ui-columntoggler .ui-columntoggler-items{border:0 none;padding:0.4em;margin:0;}.ui-columntoggler .ui-columntoggler-item{border:0px none;cursor:pointer;font-weight:normal;margin:1px 0;padding:3px 5px;text-align:left;white-space:nowrap;display:block;position:relative;}.ui-columntoggler .ui-columntoggler-item .ui-chkbox{position:absolute;top:50%;margin-top:-8px;}.ui-columntoggler .ui-columntoggler-item label{display:block;padding-left:2.2em;} diff --git a/pom.xml b/pom.xml index f89c30c2ae5..2cdc81d9f76 100644 --- a/pom.xml +++ b/pom.xml @@ -190,7 +190,7 @@ org.primefaces primefaces - 10.0.0 + 11.0.0 org.primefaces.themes From 3c2e645764509c162396895d2077da15dd1109f3 Mon Sep 17 00:00:00 2001 From: Stephen Kraffmiller Date: Mon, 25 Apr 2022 15:13:12 -0400 Subject: [PATCH 2/6] #8456 add release notes --- doc/release-notes/8456-upgrade-primefaces.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 doc/release-notes/8456-upgrade-primefaces.md diff --git a/doc/release-notes/8456-upgrade-primefaces.md b/doc/release-notes/8456-upgrade-primefaces.md new file mode 100644 index 00000000000..6c7fad9fec8 --- /dev/null +++ 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. + From 74dc796211b16b92c6c0f6a8f12f4e0897b1058f Mon Sep 17 00:00:00 2001 From: Stephen Kraffmiller Date: Mon, 25 Apr 2022 15:20:35 -0400 Subject: [PATCH 3/6] #8456 update Primefaces config url --- doc/sphinx-guides/source/developers/debugging.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sphinx-guides/source/developers/debugging.rst b/doc/sphinx-guides/source/developers/debugging.rst index d4ba214d5be..2088afe5521 100644 --- 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 ---- From ddde023a40a88a9a3c96fa26122efd7ef5433993 Mon Sep 17 00:00:00 2001 From: Stephen Kraffmiller Date: Thu, 28 Apr 2022 09:59:57 -0400 Subject: [PATCH 4/6] #8456 fix manage groups --- src/main/webapp/manage-groups.xhtml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/manage-groups.xhtml b/src/main/webapp/manage-groups.xhtml index 6a505e34358..3c70a436471 100644 --- a/src/main/webapp/manage-groups.xhtml +++ b/src/main/webapp/manage-groups.xhtml @@ -140,6 +140,7 @@ Date: Thu, 28 Apr 2022 10:29:46 -0400 Subject: [PATCH 5/6] #8456 fix copy template --- src/main/java/edu/harvard/iq/dataverse/Template.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/edu/harvard/iq/dataverse/Template.java b/src/main/java/edu/harvard/iq/dataverse/Template.java index da9bbfd8374..80567931ee4 100644 --- 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; } From 7cb4cbdabe63fd0e369bff0871bf81ab02987f9b Mon Sep 17 00:00:00 2001 From: Stephen Kraffmiller Date: Fri, 29 Apr 2022 11:26:19 -0400 Subject: [PATCH 6/6] #8456 fix updates on delete GB, template --- src/main/webapp/manage-guestbooks.xhtml | 2 +- src/main/webapp/manage-templates.xhtml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/manage-guestbooks.xhtml b/src/main/webapp/manage-guestbooks.xhtml index 7b567a09f46..21d808147d2 100644 --- a/src/main/webapp/manage-guestbooks.xhtml +++ b/src/main/webapp/manage-guestbooks.xhtml @@ -153,7 +153,7 @@ #{bundle['dataset.manageGuestbooks.tab.action.btn.delete.dialog.tip']}

- + diff --git a/src/main/webapp/manage-templates.xhtml b/src/main/webapp/manage-templates.xhtml index 48a96a3a324..1af6760534f 100644 --- a/src/main/webapp/manage-templates.xhtml +++ b/src/main/webapp/manage-templates.xhtml @@ -156,7 +156,7 @@
- +