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

Bug #1589: Fix issue using orderVersion for all the elements to be updated or added

Browse source 
FEA: ItEr77S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2012-12-05 11:05:38 +01:00
parent 8be20340bf
commit 5a76e6281e
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java
View file

@ -542,14 +542,22 @@ public final class OrderElementConverter {
OrderElementDTO orderElementDTO,
ConfigurationOrderElementConverter configuration)
throws ValidationException {
updateExceptCriterionRequirements(orderElement, orderElementDTO,
configuration);
update(null, orderElement, orderElementDTO, configuration);
}
private final static void update(OrderVersion orderVersion,
OrderElement orderElement, OrderElementDTO orderElementDTO,
ConfigurationOrderElementConverter configuration)
throws ValidationException {
updateExceptCriterionRequirements(orderVersion, orderElement,
orderElementDTO, configuration);
if (configuration.isCriterionRequirements()) {
addOrCriterionRequirements(orderElement, orderElementDTO);
}
}
private final static void updateExceptCriterionRequirements(
OrderVersion orderVersion,
OrderElement orderElement, OrderElementDTO orderElementDTO,
ConfigurationOrderElementConverter configuration)
throws ValidationException {
@ -577,7 +585,6 @@ public final class OrderElementConverter {
}
}
} else { // orderElementDTO instanceof OrderLineGroupDTO
OrderVersion orderVersion = null;
if (orderElementDTO instanceof OrderDTO) {
if (!(orderElement instanceof Order)) {
throw new ValidationException(MessageFormat.format(
@ -623,7 +630,8 @@ public final class OrderElementConverter {
for (OrderElementDTO childDTO : ((OrderLineGroupDTO) orderElementDTO).children) {
if (orderElement.containsOrderElement(childDTO.code)) {
update(orderElement.getOrderElement(childDTO.code),
update(orderVersion,
orderElement.getOrderElement(childDTO.code),
childDTO, configuration);
} else {
if (checkConstraintUniqueOrderCode(childDTO)) {