From aa3d289701f5881c8a85747e68396e30eeff1351 Mon Sep 17 00:00:00 2001 From: lewa <lene.wasskog@nibio.no> Date: Mon, 6 May 2024 09:39:13 +0200 Subject: [PATCH] feat: Do not set statusChanged fields on first save --- .../java/no/nibio/vips/logic/service/ObservationService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/no/nibio/vips/logic/service/ObservationService.java b/src/main/java/no/nibio/vips/logic/service/ObservationService.java index 1a8c8b3d..861dbfb1 100755 --- a/src/main/java/no/nibio/vips/logic/service/ObservationService.java +++ b/src/main/java/no/nibio/vips/logic/service/ObservationService.java @@ -976,7 +976,7 @@ public class ObservationService { mergeObs.setStatusChangedByUserId(user.getUserId()); mergeObs.setStatusChangedTime(now); mergeObs.setStatusTypeId(ObservationStatusType.STATUS_APPROVED); - } else if(!newStatusTypeId.equals(originalStatusTypeId)) { + } else if(originalStatusTypeId != null && !newStatusTypeId.equals(originalStatusTypeId)) { LOGGER.info("Change status from {} to {} for observation {}", originalStatusTypeId, newStatusTypeId, mergeObs.getObservationId()); mergeObs.setStatusChangedByUserId(user.getUserId()); mergeObs.setStatusChangedTime(now); -- GitLab