From 656702bbddfb2b726004cd1696aed0518ec6079d Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Mon, 14 Oct 2019 14:32:40 +0200
Subject: [PATCH] Bugfix: Now it's possible to delete an observation that is
connected to and organization group
---
.../nibio/vips/logic/controller/session/ObservationBean.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/main/java/no/nibio/vips/logic/controller/session/ObservationBean.java b/src/main/java/no/nibio/vips/logic/controller/session/ObservationBean.java
index 4baea740..eefdc205 100755
--- a/src/main/java/no/nibio/vips/logic/controller/session/ObservationBean.java
+++ b/src/main/java/no/nibio/vips/logic/controller/session/ObservationBean.java
@@ -291,6 +291,10 @@ public class ObservationBean {
public void deleteObservation(Integer observationId) {
Observation observation = em.find(Observation.class, observationId);
+ // Delete all current group memberships
+ em.createNativeQuery("DELETE FROM public.organization_group_observation WHERE observation_id=:observationId")
+ .setParameter("observationId", observation.getObservationId())
+ .executeUpdate();
em.remove(observation);
}
--
GitLab