diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java index cae913493..a85c5fdcf 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java @@ -156,6 +156,15 @@ public class CompanyPlanningController implements Composer { } private void loadPredefinedBandboxFilter() { + List sessionFilterPairs = (List) Sessions + .getCurrent().getAttribute("companyFilterLabel"); + if (sessionFilterPairs != null && !sessionFilterPairs.isEmpty()) { + for (FilterPair filterPair : sessionFilterPairs) { + bdFilters.addSelectedElement(filterPair); + } + return; + } + User user; try { user = this.userDAO.findByLoginName(SecurityUtils @@ -313,6 +322,8 @@ public class CompanyPlanningController implements Composer { filterStartDate.getValue()); Sessions.getCurrent().setAttribute("companyFilterFinishDate", filterFinishDate.getValue()); + Sessions.getCurrent().setAttribute("companyFilterLabel", + bdFilters.getSelectedElements()); filterByPredicate(createPredicate()); }