Skip to content

Commit 8a43889

Browse files
committed
minor tweaks
1 parent 35e268f commit 8a43889

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

src/main/java/edu/harvard/iq/dataverse/DatasetVersionUI.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -458,10 +458,11 @@ public void setMetadataValueBlocks(DatasetVersion datasetVersion) {
458458
mdb.setEmpty(false);
459459
datasetFieldsForView.add(dsf);
460460
}
461-
//Setting Local Display on Create on mdb when there are any set at dataverse level
462-
if (dsf.getDatasetFieldType().getLocalDisplayOnCreate() != null && dsf.getDatasetFieldType().getLocalDisplayOnCreate()){
463-
mdb.setLocalDisplayOnCreate(true);
464-
}
461+
// Setting Local Display on Create on mdb when there are any set at dataverse
462+
// level
463+
if (dsf.getDatasetFieldType().shouldDisplayOnCreate()) {
464+
mdb.setLocalDisplayOnCreate(true);
465+
}
465466
}
466467
}
467468

src/main/java/edu/harvard/iq/dataverse/MetadataBlock.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,17 +101,18 @@ public void setDatasetFieldTypes(List<DatasetFieldType> datasetFieldTypes) {
101101
}
102102

103103
public boolean isDisplayOnCreate() {
104-
// relying on "should" doesn't seem to work in context of a template
105-
// adding a transient that is updated in the DatasetVersionUI to fix
104+
//Localize case - e.g. being called in the context of a specific collection
105+
if (getLocalDisplayOnCreate() != null){
106+
return getLocalDisplayOnCreate();
107+
}
108+
// Non-localized case - the datasetFieldTypes are straight from the database and
109+
// never have dsfType.localDsiplayOnCreate set.
106110
for (DatasetFieldType dsfType : datasetFieldTypes) {
107-
boolean shouldDisplayOnCreate = dsfType.shouldDisplayOnCreate();
111+
boolean shouldDisplayOnCreate = dsfType.isDisplayOnCreate();
108112
if (shouldDisplayOnCreate) {
109113
return true;
110114
}
111115
}
112-
if (getLocalDisplayOnCreate() != null){
113-
return getLocalDisplayOnCreate();
114-
}
115116
return false;
116117
}
117118

0 commit comments

Comments
 (0)