From 10a8e9380305878f2e68cfce88c962b471fa96e7 Mon Sep 17 00:00:00 2001
From: sgiannopoulos <sgiannopoulos@cite.gr>
Date: Thu, 25 Apr 2024 12:21:02 +0300
Subject: [PATCH] update common models

---
 dmp-backend/core/pom.xml                                   | 6 +++---
 .../descriptiontemplate/FieldSetCommonModelBuilder.java    | 2 +-
 dmp-frontend/src/assets/i18n/en.json                       | 7 ++++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/dmp-backend/core/pom.xml b/dmp-backend/core/pom.xml
index df8565ecd..630cba3e8 100644
--- a/dmp-backend/core/pom.xml
+++ b/dmp-backend/core/pom.xml
@@ -51,17 +51,17 @@
         <dependency>
             <groupId>gr.cite.opendmp</groupId>
             <artifactId>repositorydepositbase</artifactId>
-            <version>2.0.6</version>
+            <version>2.0.7</version>
         </dependency>
         <dependency>
             <groupId>gr.cite.opendmp</groupId>
             <artifactId>common-models</artifactId>
-            <version>0.0.9</version>
+            <version>0.0.10</version>
         </dependency>
         <dependency>
             <groupId>gr.cite.opendmp</groupId>
             <artifactId>file-transformer-base</artifactId>
-            <version>0.0.13</version>
+            <version>0.0.14</version>
         </dependency>
         <dependency>
             <groupId>gr.cite</groupId>
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/commonmodels/descriptiontemplate/FieldSetCommonModelBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/commonmodels/descriptiontemplate/FieldSetCommonModelBuilder.java
index 72e1169ab..bef939f3f 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/commonmodels/descriptiontemplate/FieldSetCommonModelBuilder.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/commonmodels/descriptiontemplate/FieldSetCommonModelBuilder.java
@@ -55,8 +55,8 @@ public class FieldSetCommonModelBuilder extends BaseCommonModelBuilder<FieldSetM
             m.setDescription(d.getDescription());
             m.setExtendedDescription(d.getExtendedDescription());
             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.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()));
             models.add(new CommonModelBuilderItemResponse<>(m, d));
         }
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index a79e46566..6ea037d4f 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -22,7 +22,8 @@
 			"UNSUCCESSFUL-DELETE": "Unsuccessful Delete",
 			"UNSUCCESSFUL-EMAIL-SEND": "Failed sending email",
 			"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": {
 			"HTTP-REQUEST-ERROR": "An Unexpected Error Has Occurred"
@@ -304,8 +305,8 @@
 	"TENANT-CONFIGURATION-EDITOR": {
 		"TITLE": "Tenant Configuration",
 		"DEFAULT-USER-LOCALE":{
-			"TITLE": "Default User Locale",
-			"HINT": "Default locale assigned to new users"
+			"TITLE": "Default Tenant Locale",
+			"HINT": "Default tenant locale"
 		},
 		"CSS-COLORS":{
 			"TITLE": "App Colors",