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 132d3b3ea..05bc45078 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 @@ -32,6 +32,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.logging.Filter; import javax.annotation.Resource; @@ -591,6 +592,27 @@ public class OrderElementTreeController extends TreeController { FilterUtils .writeOrderTaskName(order, filterNameOrderElement.getValue()); + FilterUtils.writeOrderInheritance(order, + labelsWithoutInheritance.isChecked()); + List result = new ArrayList(); + for (FilterPair filterPair : (List) bdFiltersOrderElement + .getSelectedElements()) { + result.add(toTasKElementFilterEnum(filterPair)); + } + FilterUtils.writeOrderParameters(order, result); + + } + + private FilterPair toTasKElementFilterEnum(FilterPair each) { + switch ((OrderElementFilterEnum) each.getType()) { + case Label: + return new FilterPair(TaskElementFilterEnum.Label, + each.getPattern(), each.getValue()); + case Criterion: + return new FilterPair(TaskElementFilterEnum.Criterion, + each.getPattern(), each.getValue()); + } + return null; } private OrderElementPredicate createPredicate() { diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java index b677e11e5..a149fb19a 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java @@ -237,8 +237,9 @@ public class OrderPlanningController implements Composer { filterFinishDateOrderElement.setValue(FilterUtils .readOrderEndDate(order)); if (FilterUtils.readOrderParameters(order) != null) { + bdFiltersOrderElement.clear(); for (Object each : FilterUtils.readOrderParameters(order)) { - bdFiltersOrderElement.addSelectedElement(each); + bdFiltersOrderElement.addSelectedElement(each); } } if (FilterUtils.readOrderInheritance(order) != null) {