From 2d102d234fde7039bdb4ef425aaa8d73037f6879 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Fri, 22 Oct 2010 09:42:01 +0200 Subject: [PATCH] Fixing problem with order code validation in subcontract service. * The order code has been validated before the new code was generated. * Commented out the lines doing the validation and marking as FIXME to review in the future. FEA: ItEr62S05BugFixing --- .../navalplanner/ws/common/impl/OrderElementConverter.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java index cd087f216..cb93978a7 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java @@ -252,9 +252,12 @@ public final class OrderElementConverter { } OrderElement orderElement = toEntityExceptCriterionRequirements( orderVersion, orderElementDTO, configuration); + + // FIXME Review why this validation is needed here, it breaks the + // subcontract service. This was introduced at commit 341145a5 // Validate OrderElement.code and HoursGroup.code must be unique - Order.checkConstraintOrderUniqueCode(orderElement); - HoursGroup.checkConstraintHoursGroupUniqueCode(orderElement); + // Order.checkConstraintOrderUniqueCode(orderElement); + // HoursGroup.checkConstraintHoursGroupUniqueCode(orderElement); if (configuration.isCriterionRequirements()) { addOrCriterionRequirements(orderElement, orderElementDTO);