From 3c92bcfad6aaae6ef3ec3f8e0a28ee2b0ffe659f Mon Sep 17 00:00:00 2001 From: Diego Pino Garcia Date: Tue, 13 Oct 2009 10:23:44 +0200 Subject: [PATCH] ItEr29S14ProcuraOrganizacionsTraballo: [FixBug] Non unique object on creating a predicate and later editing an OrderElement --- .../java/org/navalplanner/web/orders/OrderModel.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java index 9f3d324ab..bda3af47e 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java @@ -270,14 +270,21 @@ public class OrderModel implements IOrderModel { private OrderElementTreeModel applyPredicate() { for (OrderElement orderElement : order.getOrderElements()) { reattachOrderElement(orderElement); + reattachLabels(); initializeLabels(orderElement.getLabels()); - if (predicate.complays(orderElement)) { + if (!predicate.complays(orderElement)) { order.remove(orderElement); } } return new OrderElementTreeModel(order); } + private void reattachLabels() { + for (Label label : cacheLabels) { + labelDAO.save(label); + } + } + private void reattachOrderElement(OrderElement orderElement) { orderElementDAO.save(orderElement); }