Skip to content

#8646 carry TOA over to access popup on template change #8734

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.

Sign up for GitHub

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

Merged
kcondon merged 5 commits into from
May 26, 2022
Merged

#8646 carry TOA over to access popup on template change #8734

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
307a6f2
#8646 carry TOA over to access popup on template change
sekmiller May 24, 2022
b541dc9
Merge branch 'develop' into 8646-TOA-on-restrict-file-popup
sekmiller May 24, 2022
826acba
#8646 fix toa refresh on change template
sekmiller May 26, 2022
d246f1d
Merge branch 'develop' into 8646-TOA-on-restrict-file-popup
sekmiller May 26, 2022
3ea5b20
Merge branch 'develop' into 8646-TOA-on-restrict-file-popup
sekmiller May 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1660,15 +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();
}
resetVersionUI();

}

/*
Expand Down Expand Up @@ -1762,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) {
Expand Down