hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 01:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

108055: isClosed method should use xml configuration

Browse Source 
(cherry picked from commit d800d800d5)
This commit is contained in:
Jens Vannerum
2023-11-08 12:02:37 +01:00
committed by github-actions[bot]
parent 5601392e84
commit adf644535c
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SubmissionFormConverter.java
View File

@@ -125,7 +125,7 @@ public class SubmissionFormConverter implements DSpaceConverter<DCInputSet, Subm
dcinput.getVocabulary()));
selMd.setClosed(
isClosed(dcinput.getSchema(), dcinput.getElement(), dcinput.getQualifier(),
dcinput.getPairsType(), dcinput.getVocabulary()));
dcinput.getPairsType(), dcinput.getVocabulary(), dcinput.isClosedVocabulary()));
} else {
inputRest.setType(inputType);
}
@@ -145,7 +145,7 @@ public class SubmissionFormConverter implements DSpaceConverter<DCInputSet, Subm
selMd.setControlledVocabulary(getAuthorityName(dcinput.getSchema(), dcinput.getElement(),
pairs.get(idx + 1), dcinput.getPairsType(), dcinput.getVocabulary()));
selMd.setClosed(isClosed(dcinput.getSchema(), dcinput.getElement(),
dcinput.getQualifier(), null, dcinput.getVocabulary()));
dcinput.getQualifier(), null, dcinput.getVocabulary(), dcinput.isClosedVocabulary()));
}
selectableMetadata.add(selMd);
}
@@ -212,9 +212,11 @@ public class SubmissionFormConverter implements DSpaceConverter<DCInputSet, Subm
}
private boolean isClosed(String schema, String element, String qualifier, String valuePairsName,
String vocabularyName) {
if (StringUtils.isNotBlank(valuePairsName) || StringUtils.isNotBlank(vocabularyName)) {
String vocabularyName, boolean isClosedVocabulary) {
if (StringUtils.isNotBlank(valuePairsName)) {
return true;
} else if (StringUtils.isNotBlank(vocabularyName)) {
return isClosedVocabulary;
}
return authorityUtils.isClosed(schema, element, qualifier);
}