From 04f98985405b52669485d55a6efc45b2e4043cd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Wed, 25 Nov 2009 17:25:28 +0100 Subject: [PATCH] ItEr36S07ValidacionEProbasFuncionaisItEr35S08: Fix. When saving a resource with some criterion it was failing. --- .../resources/machine/AssignedMachineCriterionsModel.java | 5 +++-- .../web/resources/worker/AssignedCriterionsModel.java | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java index 8484e1e58..2eb7b6cae 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java @@ -8,7 +8,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.hibernate.validator.InvalidValue; import org.navalplanner.business.common.exceptions.ValidationException; import org.navalplanner.business.resources.daos.ICriterionTypeDAO; import org.navalplanner.business.resources.daos.IResourceDAO; @@ -377,7 +376,9 @@ public class AssignedMachineCriterionsModel implements IAssignedMachineCriterion satisfaction.setIsDeleted(true); } else { satisfaction.setStartDate(satisfactionDTO.getStartDate()); - satisfaction.finish(satisfactionDTO.getEndDate()); + if (satisfactionDTO.getEndDate() != null) { + satisfaction.finish(satisfactionDTO.getEndDate()); + } } } newList.add(satisfaction); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java index f788bf9af..12ffe64f4 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java @@ -333,7 +333,9 @@ public class AssignedCriterionsModel implements IAssignedCriterionsModel { satisfaction.setIsDeleted(true); } else { satisfaction.setStartDate(satisfactionDTO.getStartDate()); - satisfaction.finish(satisfactionDTO.getEndDate()); + if (satisfactionDTO.getEndDate() != null) { + satisfaction.finish(satisfactionDTO.getEndDate()); + } } } newList.add(satisfaction);