From c1f104dc2024977864b2dc3c6c20cc85006a181e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Tue, 2 Feb 2010 16:20:34 +0100 Subject: [PATCH] ItEr46S04ValidacionEProbasFuncionaisItEr45S04: Correction. Only root templates are eligible for being a subelement. --- .../business/templates/entities/OrderElementTemplate.java | 4 ++++ .../components/finders/TemplatesEligibleForSubElement.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderElementTemplate.java b/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderElementTemplate.java index ef52450f2..0830860fe 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderElementTemplate.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderElementTemplate.java @@ -400,4 +400,8 @@ public abstract class OrderElementTemplate extends BaseEntity implements public Set getAdvanceAssignmentTemplates() { return Collections.unmodifiableSet(advanceAssignmentTemplates); } + + public boolean isRoot() { + return getParent() == null; + } } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/TemplatesEligibleForSubElement.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/TemplatesEligibleForSubElement.java index 310484386..de4fb89e2 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/TemplatesEligibleForSubElement.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/TemplatesEligibleForSubElement.java @@ -52,7 +52,7 @@ public class TemplatesEligibleForSubElement extends .list(OrderElementTemplate.class); List result = new ArrayList(); for (OrderElementTemplate each : all) { - if ((!(each instanceof OrderTemplate))) { + if (!(each instanceof OrderTemplate) && each.isRoot()) { result.add(each); } }