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 9eaa8d8ee..4c1b99670 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 @@ -191,6 +191,7 @@ public class OrderModel implements IOrderModel { @Override @Transactional(readOnly = true) public List getOrders() { + User user; try { user = userDAO.findByLoginName(SecurityUtils.getSessionUserLoginName()); @@ -200,6 +201,7 @@ public class OrderModel implements IOrderModel { //anyway, if it happenned we return an empty list return new ArrayList(); } + getLabelsOnConversation().reattachLabels(); List orders = orderDAO.getOrdersByReadAuthorization(user); initializeOrders(orders); return orders; @@ -686,8 +688,10 @@ public class OrderModel implements IOrderModel { @Override @Transactional(readOnly = true) public List getFilterOrders(OrderPredicate predicate) { + reattachLabels(); List filterOrderList = new ArrayList(); for (Order order : orderList) { + orderDAO.reattach(order); if (predicate.accepts(order)) { filterOrderList.add(order); }