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

[Bug #1064] Fixed more problems related with this issue.

Browse source 
FEA: ItEr74S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2011-05-10 16:33:05 +02:00
parent 9a43ab48fa
commit d1342cc4b8
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java
View file

@ -1096,7 +1096,7 @@ public abstract class OrderElement extends IntegrationEntity implements
return false;
}
protected boolean checkAncestorsNoOtherLabelRepeated(Label newLabel) {
public boolean checkAncestorsNoOtherLabelRepeated(Label newLabel) {
for (Label label : labels) {
if (label.isEqualTo(newLabel)) {
return false;

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

@ -241,8 +241,10 @@ public abstract class OrderElementTemplate extends BaseEntity implements
private void setupCriterionRequirements(OrderElement orderElement) {
for (DirectCriterionRequirement each : getDirectCriterionRequirements()) {
orderElement.addCriterionRequirement(DirectCriterionRequirement
.copyFrom(each, orderElement));
if (orderElement.canAddCriterionRequirement(each)) {
orderElement.addCriterionRequirement(DirectCriterionRequirement
.copyFrom(each, orderElement));
}
}
}
@ -255,7 +257,9 @@ public abstract class OrderElementTemplate extends BaseEntity implements
private void setupLabels(OrderElement orderElement) {
for (Label each : getLabels()) {
orderElement.addLabel(each);
if (orderElement.checkAncestorsNoOtherLabelRepeated(each)) {
orderElement.addLabel(each);
}
}
}