Skip to content

Commit

Permalink
Merge remote-tracking branch 'IQSS/develop' into TDL/7493-improve_Bag…
Browse files Browse the repository at this point in the history
…Gnerator_failure_handling
  • Loading branch information
qqmyers committed May 27, 2022
2 parents c89a9a1 + 4d10da5 commit 465bb8c
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 11 deletions.
25 changes: 16 additions & 9 deletions src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
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
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ public JsonLDTerm getDescriptionTextTerm() {

private JsonLDTerm getTermFor(String fieldTypeName) {
//Could call datasetFieldService.findByName(fieldTypeName) - is that faster/prefereable?
for (DatasetField dsf : version.getDatasetFields()) {
for (DatasetField dsf : version.getFlatDatasetFields()) {
DatasetFieldType dsft = dsf.getDatasetFieldType();
if (dsft.getName().equals(fieldTypeName)) {
return dsft.getJsonLDTerm();
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/metadataFragment.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
<div class="panel-group">
<p>
<h:outputFormat
rendered="#{(mdLangCode!='undefined') and ((editMode == 'CREATE') or (editMode == 'METADATA'))}"
rendered="#{(!empty(mdLang) and mdLangCode!='undefined') and ((editMode == 'CREATE') or (editMode == 'METADATA'))}"
value="#{bundle['dataset.metadatalanguage.create.guidance']}"
escape="false">
<f:param value="#{mdLang}" />
Expand Down

0 comments on commit 465bb8c

Please sign in to comment.