diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementPredicate.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementPredicate.java index 450b3b19e..a7c2ef3f2 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementPredicate.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementPredicate.java @@ -67,6 +67,11 @@ public class OrderElementPredicate implements IPredicate { return accepts(orderElement) || accepts(orderElement.getAllChildren()); } + public boolean isEmpty() { + return (filters.isEmpty() && startDate == null && finishDate == null && name + .isEmpty()); + } + private boolean accepts(OrderElement orderElement) { if (orderElement == null) { return false; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java index ce3874210..700471b2f 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java @@ -602,7 +602,8 @@ public class OrderElementTreeController extends TreeController { @Override protected boolean isPredicateApplied() { - return predicate != null; + return (predicate != null) + && !((OrderElementPredicate) predicate).isEmpty(); } /**