[GITFLOW]merging 'hotfix-1.95.1' into 'master'

MateStrysewske · MateStrysewske · commit 6a641e938167 · 2024-02-26T09:47:40.000+01:00
diff --git a/sormas-api/pom.xml b/sormas-api/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>de.symeda.sormas</groupId>
 		<artifactId>sormas-base</artifactId>
-		<version>1.95.0</version>
+		<version>1.95.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseReferenceDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseReferenceDto.java
@@ -83,7 +83,7 @@ public static String buildCaption(String uuid, String firstName, String lastName
 		return shortUuid;
 	}
 
-	public String getName() {
+	public String buildNameCaption() {
 		return PersonDto.buildCaption(firstName, lastName);
 	}
 }
diff --git a/sormas-app/pom.xml b/sormas-app/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>sormas-base</artifactId>
 		<groupId>de.symeda.sormas</groupId>
-		<version>1.95.0</version>
+		<version>1.95.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/sormas-backend/pom.xml b/sormas-backend/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>sormas-base</artifactId>
 		<groupId>de.symeda.sormas</groupId>
-		<version>1.95.0</version>
+		<version>1.95.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/sormas-base/pom.xml b/sormas-base/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>de.symeda.sormas</groupId>
 	<artifactId>sormas-base</artifactId>
 	<packaging>pom</packaging>
-	<version>1.95.0</version>
+	<version>1.95.1</version>
 
 	<properties>
 		<maven.minimum.version>3.6.3</maven.minimum.version>
diff --git a/sormas-cargoserver/pom.xml b/sormas-cargoserver/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>de.symeda.sormas</groupId>
         <artifactId>sormas-base</artifactId>
-        <version>1.95.0</version>
+        <version>1.95.1</version>
         <relativePath>../sormas-base</relativePath>
     </parent>
 
diff --git a/sormas-ear/pom.xml b/sormas-ear/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>de.symeda.sormas</groupId>
 		<artifactId>sormas-base</artifactId>
-		<version>1.95.0</version>
+		<version>1.95.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 
diff --git a/sormas-keycloak-service-provider/pom.xml b/sormas-keycloak-service-provider/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>sormas-base</artifactId>
 		<groupId>de.symeda.sormas</groupId>
-		<version>1.95.0</version>
+		<version>1.95.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/sormas-rest/pom.xml b/sormas-rest/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>de.symeda.sormas</groupId>
 		<artifactId>sormas-base</artifactId>
-		<version>1.95.0</version>
+		<version>1.95.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 
diff --git a/sormas-serverlibs/pom.xml b/sormas-serverlibs/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>sormas-base</artifactId>
 		<groupId>de.symeda.sormas</groupId>
-		<version>1.95.0</version>
+		<version>1.95.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/sormas-ui/pom.xml b/sormas-ui/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>sormas-base</artifactId>
 		<groupId>de.symeda.sormas</groupId>
-		<version>1.95.0</version>
+		<version>1.95.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/exposure/ExposuresField.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/exposure/ExposuresField.java
@@ -234,7 +234,7 @@ private void addGeneratedColumns(Table table) {
 	}
 
 	private static String getContactCaseName(ContactReferenceDto contactToCase) {
-		return contactToCase.getCaze() != null ? contactToCase.getCaze().getName() : null;
+		return contactToCase.getCaze() != null ? contactToCase.getCaze().buildNameCaption() : null;
 	}
 
 	@Override
diff --git a/sormas-widgetset/pom.xml b/sormas-widgetset/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sormas-base</artifactId>
         <groupId>de.symeda.sormas</groupId>
-        <version>1.95.0</version>
+        <version>1.95.1</version>
         <relativePath>../sormas-base</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public static String buildCaption(String uuid, String firstName, String lastName`
`83`	`83`	`return shortUuid;`
`84`	`84`	`}`
`85`	`85`
`86`		`- public String getName() {`
	`86`	`+ public String buildNameCaption() {`
`87`	`87`	`return PersonDto.buildCaption(firstName, lastName);`
`88`	`88`	`}`
`89`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ private void addGeneratedColumns(Table table) {`
`234`	`234`	`}`
`235`	`235`
`236`	`236`	`private static String getContactCaseName(ContactReferenceDto contactToCase) {`
`237`		`- return contactToCase.getCaze() != null ? contactToCase.getCaze().getName() : null;`
	`237`	`+ return contactToCase.getCaze() != null ? contactToCase.getCaze().buildNameCaption() : null;`
`238`	`238`	`}`
`239`	`239`
`240`	`240`	`@Override`