From 40a25c8d55c8283be39c761c5c00ed14f89aa633 Mon Sep 17 00:00:00 2001
From: Susana Montes Pedreira <smpedreira@gmail.com>
Date: Fri, 29 Jan 2010 10:52:23 +0100
Subject: [PATCH]  ItEr45S07ImplantacionAplicacionItEr44S08 : [Bug #254]
 reattachment of labels when loading the orders and its order elements.

---
 .../src/main/java/org/navalplanner/web/orders/OrderModel.java | 4 ++++
 1 file changed, 4 insertions(+)

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<Order> 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<Order>();
         }
+        getLabelsOnConversation().reattachLabels();
         List<Order> orders = orderDAO.getOrdersByReadAuthorization(user);
         initializeOrders(orders);
         return orders;
@@ -686,8 +688,10 @@ public class OrderModel implements IOrderModel {
     @Override
     @Transactional(readOnly = true)
     public List<Order> getFilterOrders(OrderPredicate predicate) {
+        reattachLabels();
         List<Order> filterOrderList = new ArrayList<Order>();
         for (Order order : orderList) {
+            orderDAO.reattach(order);
             if (predicate.accepts(order)) {
                 filterOrderList.add(order);
             }