Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.

Commit c824be9

Browse files
MateStrysewskeMateStrysewske
committed
[GITFLOW]merging 'hotfix-1.43.2' into 'master'
2 parents fd4d414 + 557329f commit c824be9

10 files changed

Lines changed: 17 additions & 13 deletions

File tree

‎sormas-api/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<parent>
33
<groupId>de.symeda.sormas</groupId>
44
<artifactId>sormas-base</artifactId>
5-
<version>1.43.1</version>
5+
<version>1.43.2</version>
66
<relativePath>../sormas-base</relativePath>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>

‎sormas-api/src/main/java/de/symeda/sormas/api/utils/jurisdiction/ContactJurisdictionHelper.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,15 @@ public static boolean isInJurisdiction(
3939
case NATION:
4040
return true;
4141
case REGION:
42-
return contactJurisdiction.getRegionUuid() != null
43-
&& DataHelper.equal(contactJurisdiction.getRegionUuid(), userJurisdiction.getRegionUuid());
42+
if (contactJurisdiction.getRegionUuid() != null) {
43+
return DataHelper.equal(contactJurisdiction.getRegionUuid(), userJurisdiction.getRegionUuid());
44+
}
45+
break;
4446
case DISTRICT:
45-
return contactJurisdiction.getDistrictUuid() != null
46-
&& DataHelper.equal(contactJurisdiction.getDistrictUuid(), userJurisdiction.getDistrictUuid());
47+
if (contactJurisdiction.getDistrictUuid() != null) {
48+
return DataHelper.equal(contactJurisdiction.getDistrictUuid(), userJurisdiction.getDistrictUuid());
49+
}
50+
break;
4751
case COMMUNITY:
4852
return false;
4953
case HEALTH_FACILITY:

‎sormas-app/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>sormas-base</artifactId>
55
<groupId>de.symeda.sormas</groupId>
6-
<version>1.43.1</version>
6+
<version>1.43.2</version>
77
<relativePath>../sormas-base</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎sormas-backend/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>sormas-base</artifactId>
55
<groupId>de.symeda.sormas</groupId>
6-
<version>1.43.1</version>
6+
<version>1.43.2</version>
77
<relativePath>../sormas-base</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎sormas-base/dependencies/serverlibs.pom‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<artifactId>sormas-base</artifactId>
1010
<groupId>de.symeda.sormas</groupId>
11-
<version>1.43.1</version>
11+
<version>1.43.2</version>
1212
<relativePath>../</relativePath>
1313
</parent>
1414

‎sormas-base/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>de.symeda.sormas</groupId>
66
<artifactId>sormas-base</artifactId>
77
<packaging>pom</packaging>
8-
<version>1.43.1</version>
8+
<version>1.43.2</version>
99

1010
<prerequisites>
1111
<maven>3.0</maven>

‎sormas-ear/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>de.symeda.sormas</groupId>
55
<artifactId>sormas-base</artifactId>
6-
<version>1.43.1</version>
6+
<version>1.43.2</version>
77
<relativePath>../sormas-base</relativePath>
88
</parent>
99

‎sormas-rest/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>de.symeda.sormas</groupId>
55
<artifactId>sormas-base</artifactId>
6-
<version>1.43.1</version>
6+
<version>1.43.2</version>
77
<relativePath>../sormas-base</relativePath>
88
</parent>
99

‎sormas-ui/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>sormas-base</artifactId>
55
<groupId>de.symeda.sormas</groupId>
6-
<version>1.43.1</version>
6+
<version>1.43.2</version>
77
<relativePath>../sormas-base</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎sormas-widgetset/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>sormas-base</artifactId>
55
<groupId>de.symeda.sormas</groupId>
6-
<version>1.43.1</version>
6+
<version>1.43.2</version>
77
<relativePath>../sormas-base</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

0 commit comments

Comments
 (0)