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

update common models

This commit is contained in:
Efstratios Giannopoulos 2024-04-25 12:21:02 +03:00
parent 2c98acb185
commit 10a8e93803
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dmp-backend/core/pom.xml
View File

@ -51,17 +51,17 @@
<dependency> <dependency>
<groupId>gr.cite.opendmp</groupId> <groupId>gr.cite.opendmp</groupId>
<artifactId>repositorydepositbase</artifactId> <artifactId>repositorydepositbase</artifactId>
<version>2.0.6</version> <version>2.0.7</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>gr.cite.opendmp</groupId> <groupId>gr.cite.opendmp</groupId>
<artifactId>common-models</artifactId> <artifactId>common-models</artifactId>
<version>0.0.9</version> <version>0.0.10</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>gr.cite.opendmp</groupId> <groupId>gr.cite.opendmp</groupId>
<artifactId>file-transformer-base</artifactId> <artifactId>file-transformer-base</artifactId>
<version>0.0.13</version> <version>0.0.14</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>gr.cite</groupId> <groupId>gr.cite</groupId>

2
dmp-backend/core/src/main/java/eu/eudat/model/builder/commonmodels/descriptiontemplate/FieldSetCommonModelBuilder.java
View File

@ -55,8 +55,8 @@ public class FieldSetCommonModelBuilder extends BaseCommonModelBuilder<FieldSetM
m.setDescription(d.getDescription()); m.setDescription(d.getDescription());
m.setExtendedDescription(d.getExtendedDescription()); m.setExtendedDescription(d.getExtendedDescription());
m.setAdditionalInformation(d.getAdditionalInformation()); m.setAdditionalInformation(d.getAdditionalInformation());
m.setHasMultiplicity(d.getHasMultiplicity());
if (d.getMultiplicity() != null) m.setMultiplicity(this.builderFactory.builder(MultiplicityCommonModelBuilder.class).authorize(this.authorize).build(d.getMultiplicity())); if (d.getMultiplicity() != null) m.setMultiplicity(this.builderFactory.builder(MultiplicityCommonModelBuilder.class).authorize(this.authorize).build(d.getMultiplicity()));
// if (d.getHasMultiplicity() != null) m.se(this.builderFactory.builder(MultiplicityCommonModelBuilder.class).authorize(this.authorize).build(d.getMultiplicity())); //TODO: HasMultiplicity
if (d.getFields() != null) m.setFields(this.builderFactory.builder(FieldCommonModelBuilder.class).authorize(this.authorize).build(d.getFields())); if (d.getFields() != null) m.setFields(this.builderFactory.builder(FieldCommonModelBuilder.class).authorize(this.authorize).build(d.getFields()));
models.add(new CommonModelBuilderItemResponse<>(m, d)); models.add(new CommonModelBuilderItemResponse<>(m, d));
} }

7
dmp-frontend/src/assets/i18n/en.json
View File

@ -22,7 +22,8 @@
"UNSUCCESSFUL-DELETE": "Unsuccessful Delete", "UNSUCCESSFUL-DELETE": "Unsuccessful Delete",
"UNSUCCESSFUL-EMAIL-SEND": "Failed sending email", "UNSUCCESSFUL-EMAIL-SEND": "Failed sending email",
"UNSUCCESSFUL-REMOVE-TEMPLATE": "Failed to remove template, one or more Descriptions of this Plan use this template", "UNSUCCESSFUL-REMOVE-TEMPLATE": "Failed to remove template, one or more Descriptions of this Plan use this template",
"UNSUCCESSFUL-FINALIZE": "Unsuccessful Finalize" "UNSUCCESSFUL-FINALIZE": "Unsuccessful Finalize",
"SUCCESSFUL-RESET": "Successful Reset"
}, },
"ERRORS": { "ERRORS": {
"HTTP-REQUEST-ERROR": "An Unexpected Error Has Occurred" "HTTP-REQUEST-ERROR": "An Unexpected Error Has Occurred"
@ -304,8 +305,8 @@
"TENANT-CONFIGURATION-EDITOR": { "TENANT-CONFIGURATION-EDITOR": {
"TITLE": "Tenant Configuration", "TITLE": "Tenant Configuration",
"DEFAULT-USER-LOCALE":{ "DEFAULT-USER-LOCALE":{
"TITLE": "Default User Locale", "TITLE": "Default Tenant Locale",
"HINT": "Default locale assigned to new users" "HINT": "Default tenant locale"
}, },
"CSS-COLORS":{ "CSS-COLORS":{
"TITLE": "App Colors", "TITLE": "App Colors",