From 888ef09ba64be66ff21f4dce5847ef3ed3c87de7 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Fri, 13 Aug 2010 08:54:57 +0200 Subject: [PATCH] ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #591] Adding support to breadcrumbs for 3rd level entries in NavalPlan menu. --- .../web/common/CustomMenuController.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java index 2992e9860..42b1d24c5 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java @@ -133,6 +133,9 @@ public class CustomMenuController extends Div implements IMenuItemsRegister { List items = new ArrayList(); items.add(this); items.addAll(children); + for (CustomMenuItem child : children) { + items.addAll(child.children); + } return items; } @@ -166,6 +169,13 @@ public class CustomMenuController extends Div implements IMenuItemsRegister { for (CustomMenuItem child : ci.children) { if (child.contains(requestPath)) { child.setActive(true); + List test = child.children; + for (CustomMenuItem c : child.children) { + if (c.contains(requestPath)) { + c.setActive(true); + break; + } + } break; } } @@ -278,6 +288,11 @@ public class CustomMenuController extends Div implements IMenuItemsRegister { for (CustomMenuItem child : ci.children) { if (child.isActiveParent()) { breadcrumbsPath.add(child); + for (CustomMenuItem c : child.children) { + if (c.isActiveParent()) { + breadcrumbsPath.add(c); + } + } } } }