From 2b948662f1413b856bc1a815435b835cc404976f Mon Sep 17 00:00:00 2001
From: lewa <lene.wasskog@nibio.no>
Date: Mon, 24 Jun 2024 11:32:29 +0200
Subject: [PATCH] feat(timeseries): Ensure POI is set for all users
---
.../nibio/vips/logic/service/ObservationTimeSeriesService.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/main/java/no/nibio/vips/logic/service/ObservationTimeSeriesService.java b/src/main/java/no/nibio/vips/logic/service/ObservationTimeSeriesService.java
index 643e0ea1..3d428239 100644
--- a/src/main/java/no/nibio/vips/logic/service/ObservationTimeSeriesService.java
+++ b/src/main/java/no/nibio/vips/logic/service/ObservationTimeSeriesService.java
@@ -107,15 +107,14 @@ public class ObservationTimeSeriesService {
if (requester == null && userUUID != null) {
requester = userBean.findVipsLogicUser(UUID.fromString(userUUID));
}
+ observationTimeSeriesBean.enrichObservationTimeSeriesWithPointOfInterest(ots);
boolean requesterNotValidUser = requester == null;
boolean requesterRegularUser = requester != null && !requester.isSuperUser() && !requester.isOrganizationAdmin();
boolean requesterNotCreator = requester != null && !ots.getUserId().equals(requester.getUserId());
-
if (requesterNotValidUser || requesterRegularUser) {
// Mask for all users except creator, super and orgadmin
if (!(ots.getLocationIsPrivate() && (requesterNotValidUser || requesterNotCreator)) && ots.getPolygonService() != null) {
- observationTimeSeriesBean.enrichObservationTimeSeriesWithPointOfInterest(ots);
this.maskLocation(ots.getPolygonService(), ots);
}
}
--
GitLab