MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring

This commit is contained in:
Sofia Papacharalampous 2024-05-29 13:52:40 +03:00
parent 3437311fc9 262a2cfbf2
commit 72cebd0c9d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/core/pom.xml
View File

@ -51,12 +51,12 @@
<dependency>
<groupId>org.opencdmp</groupId>
<artifactId>repositorydepositbase</artifactId>
<version>2.0.14</version>
<version>2.0.15</version>
</dependency>
<dependency>
<groupId>org.opencdmp</groupId>
<artifactId>common-models</artifactId>
<version>0.0.17</version>
<version>0.0.18</version>
</dependency>
<dependency>
<groupId>gr.cite</groupId>
@ -66,7 +66,7 @@
<dependency>
<groupId>org.opencdmp</groupId>
<artifactId>file-transformer-base</artifactId>
<version>0.0.21</version>
<version>0.0.22</version>
</dependency>
<dependency>
<groupId>gr.cite</groupId>

2
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/FieldCommonModelBuilder.java
View File

@ -53,7 +53,7 @@ public class FieldCommonModelBuilder extends BaseCommonModelBuilder<FieldModel,
FieldModel m = new FieldModel();
m.setId(d.getId());
m.setOrdinal(d.getOrdinal());
m.setSchematics(d.getSemantics());
m.setSemantics(d.getSemantics());
if (d.getDefaultValue() != null) m.setDefaultValue(this.builderFactory.builder(DefaultValueCommonModelBuilder.class).build(d.getDefaultValue()));
m.setIncludeInExport(d.getIncludeInExport());
if (!this.conventionService.isListNullOrEmpty(d.getValidations())){