From d03748cb81a2313245c8cbf14a63cec5a7fa5009 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= <jaragunde@igalia.com>
Date: Mon, 6 Sep 2010 12:48:34 +0200
Subject: [PATCH] Iterate over an order's children to retrieve its criteria
 when filtering by criteria.

We make sure the criteria are being loaded, preventing the need of pre-loading them.

FEA: ItEr60S17CambiosPantallaVistaEmpresa
---
 .../java/org/navalplanner/web/orders/OrderPredicate.java   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderPredicate.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderPredicate.java
index ed1a1477c..6ff71953a 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderPredicate.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderPredicate.java
@@ -128,6 +128,13 @@ public class OrderPredicate implements IPredicate {
                 return true;
             }
         }
+        for(OrderElement child : order.getAllChildren()) {
+            for(CriterionRequirement criterionRequirement : child.getCriterionRequirements()) {
+                if(criterionRequirement.getCriterion().getId().equals(filterCriterion.getId())){
+                    return true;
+                }
+            }
+        }
         return false;
     }