RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr46S04ValidacionEProbasFuncionaisItEr45S04: Correction.

Browse source 
Only root templates are eligible for being a subelement.
This commit is contained in:
Óscar González Fernández 2010-02-02 16:20:34 +01:00
parent e11750ecd4
commit c1f104dc20
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderElementTemplate.java
View file

@ -400,4 +400,8 @@ public abstract class OrderElementTemplate extends BaseEntity implements
public Set<AdvanceAssignmentTemplate> getAdvanceAssignmentTemplates() {
return Collections.unmodifiableSet(advanceAssignmentTemplates);
}
public boolean isRoot() {
return getParent() == null;
}
}

2
navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/TemplatesEligibleForSubElement.java
View file

@ -52,7 +52,7 @@ public class TemplatesEligibleForSubElement extends
.list(OrderElementTemplate.class);
List<OrderElementTemplate> result = new ArrayList<OrderElementTemplate>();
for (OrderElementTemplate each : all) {
if ((!(each instanceof OrderTemplate))) {
if (!(each instanceof OrderTemplate) && each.isRoot()) {
result.add(each);
}
}