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); }