From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 23 Jan 2021 07:59:04 +0000 (+0100)
Subject: Fix deletion of multiple terms.
X-Git-Tag: argeo-suite-2.1.18~28
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=66379d9c0820976853556cc342d833a9918990b5;ds=sidebyside

Fix deletion of multiple terms.
---

diff --git a/org.argeo.entity.ui/src/org/argeo/entity/ui/forms/MultiTermsPart.java b/org.argeo.entity.ui/src/org/argeo/entity/ui/forms/MultiTermsPart.java
index e26fabe..1a12e90 100644
--- a/org.argeo.entity.ui/src/org/argeo/entity/ui/forms/MultiTermsPart.java
+++ b/org.argeo.entity.ui/src/org/argeo/entity/ui/forms/MultiTermsPart.java
@@ -57,8 +57,10 @@ public class MultiTermsPart extends AbstractTermsPart {
 					ToolItem deleteItem = new ToolItem(toolBar, SWT.FLAT);
 					styleDelete(deleteItem);
 					deleteItem.addSelectionListener((Selected) (e) -> {
+						// we retrieve them again here because they may have changed
+						List<String> curr = Jcr.getMultiple(getNode(), typology);
 						List<String> newValue = new ArrayList<>();
-						for (String v : currentValue) {
+						for (String v : curr) {
 							if (!v.equals(value))
 								newValue.add(v);
 						}
@@ -155,8 +157,9 @@ public class MultiTermsPart extends AbstractTermsPart {
 			if (isTermSelectable(term))
 				termL.addMouseListener((MouseDown) (e) -> {
 					List<String> newValue = new ArrayList<>();
+					List<String> curr = Jcr.getMultiple(getNode(), typology);
 					if (currentValue != null)
-						newValue.addAll(currentValue);
+						newValue.addAll(curr);
 					newValue.add(term);
 					Jcr.set(getNode(), typology, newValue);
 					Jcr.save(getNode());