RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr45S07ImplantacionAplicacionItEr44S08 : [Bug #254] reattachment of labels when loading the orders and its order elements.

Browse source
This commit is contained in:
Susana Montes Pedreira 2010-01-29 10:52:23 +01:00 • committed by Javier Moran Rua
parent 91d15c8055
commit 40a25c8d55
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java
View file

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