Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring
This commit is contained in:
commit
556e593cbe
|
@ -460,7 +460,7 @@ public class DescriptionServiceImpl implements DescriptionService {
|
|||
DescriptionPersist.DescriptionPersistValidator validator = this.validatorFactory.validator(DescriptionPersist.DescriptionPersistValidator.class);
|
||||
validator.validate(this.buildDescriptionPersist(description));
|
||||
if (validator.result().isValid()) descriptionValidationResult.setResult(DescriptionValidationOutput.Valid);
|
||||
descriptionValidationResults.add(descriptionValidationResult);
|
||||
descriptionValidationResults.add(descriptionValidationResult);
|
||||
|
||||
}
|
||||
return descriptionValidationResults;
|
||||
|
@ -1076,8 +1076,8 @@ public class DescriptionServiceImpl implements DescriptionService {
|
|||
|
||||
if (FieldType.isTextType(fieldType)) persist.setTextValue(data.getTextValue());
|
||||
else if (FieldType.isTextListType(fieldType)) persist.setTextListValue(data.getTextListValue());
|
||||
else if (FieldType.isDateType(fieldType)) persist.setDateValue(persist.getDateValue());
|
||||
else if (FieldType.isBooleanType(fieldType)) persist.setBooleanValue(persist.getBooleanValue());
|
||||
else if (FieldType.isDateType(fieldType)) persist.setDateValue(data.getDateValue());
|
||||
else if (FieldType.isBooleanType(fieldType)) persist.setBooleanValue(data.getBooleanValue());
|
||||
else if (FieldType.isExternalIdentifierType(fieldType) && data.getExternalIdentifier() != null) persist.setExternalIdentifier(this.buildExternalIdentifierPersist(data.getExternalIdentifier()));
|
||||
else if (FieldType.isReferenceType(fieldType) && fieldEntity != null ) {
|
||||
if (!this.conventionService.isListNullOrEmpty(data.getTextListValue()) && !this.conventionService.isListNullOrEmpty(references)){
|
||||
|
|
Loading…
Reference in New Issue