From 307a6f27900217f023443c1ef5aa01f65c2ff3a7 Mon Sep 17 00:00:00 2001 From: Stephen Kraffmiller Date: Tue, 24 May 2022 13:00:35 -0400 Subject: [PATCH 1/2] #8646 carry TOA over to access popup on template change --- src/main/java/edu/harvard/iq/dataverse/DatasetPage.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java index d752c46d9a0..8a06cfa6348 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java @@ -1668,6 +1668,12 @@ public void updateSelectedTemplate(ValueChangeEvent event) { workingVersion.initDefaultValues(licenseServiceBean.getDefault()); updateDatasetFieldInputLevels(); } + /* + Issue 8646: necessary for the access popup which is shared by the dataset page and the file page + */ + setFileAccessRequest(workingVersion.getTermsOfUseAndAccess().isFileAccessRequest()); + setTermsOfAccess(workingVersion.getTermsOfUseAndAccess().getTermsOfAccess()); + resetVersionUI(); } From 826acba332e14c3cef4cc7191e2c7b8f7ea0b067 Mon Sep 17 00:00:00 2001 From: Stephen Kraffmiller Date: Thu, 26 May 2022 10:44:34 -0400 Subject: [PATCH 2/2] #8646 fix toa refresh on change template --- .../edu/harvard/iq/dataverse/DatasetPage.java | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java index 8a06cfa6348..251f3865104 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java @@ -1660,21 +1660,7 @@ public void setSelectedTemplate(Template selectedTemplate) { public void updateSelectedTemplate(ValueChangeEvent event) { selectedTemplate = (Template) event.getNewValue(); - if (selectedTemplate != null) { - //then create new working version from the selected template - workingVersion.updateDefaultValuesFromTemplate(selectedTemplate); - updateDatasetFieldInputLevels(); - } else { - workingVersion.initDefaultValues(licenseServiceBean.getDefault()); - updateDatasetFieldInputLevels(); - } - /* - Issue 8646: necessary for the access popup which is shared by the dataset page and the file page - */ - setFileAccessRequest(workingVersion.getTermsOfUseAndAccess().isFileAccessRequest()); - setTermsOfAccess(workingVersion.getTermsOfUseAndAccess().getTermsOfAccess()); - - resetVersionUI(); + } /* @@ -1768,6 +1754,21 @@ public void handleChange() { public void handleChangeButton() { + if (selectedTemplate != null) { + //then create new working version from the selected template + workingVersion.updateDefaultValuesFromTemplate(selectedTemplate); + updateDatasetFieldInputLevels(); + } else { + workingVersion.initDefaultValues(licenseServiceBean.getDefault()); + updateDatasetFieldInputLevels(); + } + /* + Issue 8646: necessary for the access popup which is shared by the dataset page and the file page + */ + setFileAccessRequest(workingVersion.getTermsOfUseAndAccess().isFileAccessRequest()); + setTermsOfAccess(workingVersion.getTermsOfUseAndAccess().getTermsOfAccess()); + + resetVersionUI(); } public boolean isShapefileType(FileMetadata fm) {