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

Added check for CHILDREN advance in container and fixed detected issue.

Browse source 
FEA: ItEr74S07WBSTreeRefactoring
This commit is contained in:
Manuel Rego Casasnovas 2011-05-06 11:51:13 +02:00
parent c7521e8c9a
commit ad59c56cca
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java
View file

@ -265,8 +265,7 @@ public class OrderLineGroup extends OrderElement implements
}
}
if (indirectAdvanceAssignments.isEmpty()
&& !orderElement.getAllDirectAdvanceAssignments().isEmpty()) {
if (!indirectAdvanceAssignments.isEmpty()) {
addChildrenAdvanceOrderLineGroup();
}
}

2
navalplanner-webapp/src/test/java/org/navalplanner/web/orders/OrderElementTreeModelTest.java
View file

@ -690,11 +690,13 @@ public class OrderElementTreeModelTest {
model.indent(element2);
assertTrue(order.getDirectAdvanceAssignments().isEmpty());
assertThat(order.getIndirectAdvanceAssignments().size(), equalTo(2));
assertNotNull(order.getIndirectAdvanceAssignment(advanceType));
assertTrue(order.getCriterionRequirements().isEmpty());
OrderLineGroup container = (OrderLineGroup) order.getChildren().get(0);
assertTrue(container.getDirectAdvanceAssignments().isEmpty());
assertThat(container.getIndirectAdvanceAssignments().size(), equalTo(2));
assertNotNull(container.getIndirectAdvanceAssignment(advanceType));
assertTrue(container.getCriterionRequirements().isEmpty());