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

SORMAS-Foundation · Mar 3, 2022 · 947ba0d · 947ba0d
2 parents cabe91e + 2cf5c70
commit 947ba0d
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 12 deletions.
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.68.2</version>
+		<version>1.68.3</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

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.68.2</version>
+		<version>1.68.3</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.68.2</version>
+		<version>1.68.3</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git a/sormas-base/dependencies/serverlibs.pom b/sormas-base/dependencies/serverlibs.pom
@@ -8,7 +8,7 @@
     <parent>
         <artifactId>sormas-base</artifactId>
         <groupId>de.symeda.sormas</groupId>
-        <version>1.68.2</version>
+        <version>1.68.3</version>
         <relativePath>../</relativePath>
     </parent>
 

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.68.2</version>
+	<version>1.68.3</version>
 
 	<properties>
 		<maven.compiler.source>1.8</maven.compiler.source>

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.68.2</version>
+        <version>1.68.3</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.68.2</version>
+		<version>1.68.3</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.68.2</version>
+		<version>1.68.3</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.68.2</version>
+		<version>1.68.3</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 

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.68.2</version>
+		<version>1.68.3</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseCreateForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseCreateForm.java
@@ -914,6 +914,7 @@ private void addHomeAddressForm() {
 		homeAddressForm.setValue(new LocationDto());
 		homeAddressForm.setCaption(null);
 		homeAddressForm.setWidthFull();
+		homeAddressForm.setDisableFacilityAddressCheck(true);
 
 		getContent().addComponent(homeAddressForm, HOME_ADDRESS_LOC);
 		homeAddressForm.setVisible(false);

diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/labmessage/LabMessageController.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/labmessage/LabMessageController.java
@@ -747,6 +747,9 @@ private CommitDiscardWrapperComponent<CaseCreateForm> getCaseCreateComponent(
 		});
 		caseCreateComponent.addDiscardListener(window::close);
 		caseCreateComponent.getWrappedComponent().setValue(caseDto);
+		if (FacadeProvider.getPersonFacade().isValidPersonUuid(person.getUuid())) {
+			caseCreateComponent.getWrappedComponent().setSearchedPerson(person);
+		}
 		caseCreateComponent.getWrappedComponent().setPerson(person);
 
 		return caseCreateComponent;

diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/location/LocationEditForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/location/LocationEditForm.java
@@ -131,6 +131,7 @@ public class LocationEditForm extends AbstractEditForm<LocationDto> {
 	private boolean districtRequiredOnDefaultCountry;
 	private boolean skipCountryValueChange;
 	private boolean skipFacilityTypeUpdate;
+	private boolean disableFacilityAddressCheck;
 
 	public LocationEditForm(FieldVisibilityCheckers fieldVisibilityCheckers, UiFieldAccessCheckers fieldAccessCheckers) {
 		super(LocationDto.class, LocationDto.I18N_PREFIX, true, fieldVisibilityCheckers, fieldAccessCheckers);
@@ -479,7 +480,7 @@ public String getFormattedHtmlMessage() {
 			// We use isAttached() to avoid the fuss when initializing the form, it may seems a bit hacky, but it is
 			// necessary because isModified() will still return true for a short duration even if we keep the very same
 			// value because of this field dependencies to other fields and the way updateEnumValues works
-			if (facility.isAttached()) {
+			if (facility.isAttached() && !disableFacilityAddressCheck) {
 				if (facility.getValue() != null) {
 					FacilityDto facilityDto =
 						FacadeProvider.getFacilityFacade().getByUuid(((FacilityReferenceDto) getField(LocationDto.FACILITY).getValue()).getUuid());
@@ -780,6 +781,10 @@ private boolean areFacilityDetailsRequired() {
 		return facility.getValue() != null && ((FacilityReferenceDto) facility.getValue()).getUuid().equals(FacilityDto.OTHER_FACILITY_UUID);
 	}
 
+	public void setDisableFacilityAddressCheck(boolean disableFacilityAddressCheck) {
+		this.disableFacilityAddressCheck = disableFacilityAddressCheck;
+	}
+
 	private static class MapPopupView extends PopupView {
 
 		private static final long serialVersionUID = 6119339732442336000L;
@@ -831,4 +836,5 @@ public void setCoordinates(GeoLatLon coordinates) {
 			this.coordinates = coordinates;
 		}
 	}
+
 }
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/PersonDependentEditForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/PersonDependentEditForm.java
@@ -95,4 +95,8 @@ protected Button createPersonSearchButton(String personSearchLoc) {
 	public PersonDto getSearchedPerson() {
 		return searchedPerson;
 	}
+
+	public void setSearchedPerson(PersonDto searchedPerson) {
+		this.searchedPerson = searchedPerson;
+	}
 }
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.68.2</version>
+        <version>1.68.3</version>
         <relativePath>../sormas-base</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>