diff --git a/sormas-api/pom.xml b/sormas-api/pom.xml index 7df9de1de00..2162b222ed5 100644 --- a/sormas-api/pom.xml +++ b/sormas-api/pom.xml @@ -2,7 +2,7 @@ de.symeda.sormas sormas-base - 1.77.4 + 1.77.5 ../sormas-base 4.0.0 diff --git a/sormas-app/pom.xml b/sormas-app/pom.xml index aadfeb954a7..5e7e204d0b5 100644 --- a/sormas-app/pom.xml +++ b/sormas-app/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.77.4 + 1.77.5 ../sormas-base 4.0.0 diff --git a/sormas-backend/pom.xml b/sormas-backend/pom.xml index 402049fd3b0..fa5453d9e04 100644 --- a/sormas-backend/pom.xml +++ b/sormas-backend/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.77.4 + 1.77.5 ../sormas-base 4.0.0 diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/contact/ContactService.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/contact/ContactService.java index 231aabf715e..d0d025927e7 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/contact/ContactService.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/contact/ContactService.java @@ -80,7 +80,6 @@ import de.symeda.sormas.api.sormastosormas.share.incoming.ShareRequestStatus; import de.symeda.sormas.api.task.TaskCriteria; import de.symeda.sormas.api.user.JurisdictionLevel; -import de.symeda.sormas.api.user.UserRight; import de.symeda.sormas.api.utils.DataHelper; import de.symeda.sormas.api.utils.DateHelper; import de.symeda.sormas.api.utils.FieldConstraints; @@ -1009,10 +1008,6 @@ public Predicate createUserFilter(ContactQueryContext contactQueryContext, Conta CriteriaQuery cq = contactQueryContext.getQuery(); CriteriaBuilder cb = contactQueryContext.getCriteriaBuilder(); - if (!getCurrentUser().hasUserRight(UserRight.CONTACT_VIEW)) { - return cb.disjunction(); - } - CaseQueryContext caseQueryContext = new CaseQueryContext(cb, cq, contactQueryContext.getJoins().getCaseJoins()); if (contactCriteria == null || contactCriteria.getIncludeContactsFromOtherJurisdictions()) { userFilter = caseService.createUserFilter(caseQueryContext); @@ -1045,11 +1040,6 @@ public Predicate createUserFilterWithoutCase(ContactQueryContext qc, ContactCrit CriteriaBuilder cb = qc.getCriteriaBuilder(); CriteriaQuery cq = qc.getQuery(); From contactPath = qc.getRoot(); - - if (!currentUser.hasUserRight(UserRight.CONTACT_VIEW)) { - return cb.disjunction(); - } - // National users can access all contacts in the system final JurisdictionLevel jurisdictionLevel = currentUser.getJurisdictionLevel(); if ((jurisdictionLevel == JurisdictionLevel.NATION && !UserRole.isPortHealthUser(currentUser.getUserRoles()))) { diff --git a/sormas-base/dependencies/serverlibs.pom b/sormas-base/dependencies/serverlibs.pom index 8b7ee2b4589..5187c5cb78d 100644 --- a/sormas-base/dependencies/serverlibs.pom +++ b/sormas-base/dependencies/serverlibs.pom @@ -8,7 +8,7 @@ sormas-base de.symeda.sormas - 1.77.4 + 1.77.5 ../ diff --git a/sormas-base/pom.xml b/sormas-base/pom.xml index b7a5190a972..4ede00adbc5 100644 --- a/sormas-base/pom.xml +++ b/sormas-base/pom.xml @@ -5,7 +5,7 @@ de.symeda.sormas sormas-base pom - 1.77.4 + 1.77.5 1.8 diff --git a/sormas-cargoserver/pom.xml b/sormas-cargoserver/pom.xml index 760059422b4..36771f0cd27 100644 --- a/sormas-cargoserver/pom.xml +++ b/sormas-cargoserver/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 1.77.4 + 1.77.5 ../sormas-base diff --git a/sormas-ear/pom.xml b/sormas-ear/pom.xml index 257b9aa660e..7d7065ea01e 100644 --- a/sormas-ear/pom.xml +++ b/sormas-ear/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 1.77.4 + 1.77.5 ../sormas-base diff --git a/sormas-keycloak-service-provider/pom.xml b/sormas-keycloak-service-provider/pom.xml index add417eeaec..9404b1a0868 100644 --- a/sormas-keycloak-service-provider/pom.xml +++ b/sormas-keycloak-service-provider/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.77.4 + 1.77.5 ../sormas-base 4.0.0 diff --git a/sormas-rest/pom.xml b/sormas-rest/pom.xml index bc81b3dd39e..52edd2ea36d 100644 --- a/sormas-rest/pom.xml +++ b/sormas-rest/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 1.77.4 + 1.77.5 ../sormas-base diff --git a/sormas-ui/pom.xml b/sormas-ui/pom.xml index 6cdcf8e51ec..7671e0edb7e 100644 --- a/sormas-ui/pom.xml +++ b/sormas-ui/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.77.4 + 1.77.5 ../sormas-base 4.0.0 diff --git a/sormas-widgetset/pom.xml b/sormas-widgetset/pom.xml index adcebac7ef8..6228e84df16 100644 --- a/sormas-widgetset/pom.xml +++ b/sormas-widgetset/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.77.4 + 1.77.5 ../sormas-base 4.0.0