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

ItEr36S07ValidacionEProbasFuncionaisItEr35S08: Fix. When saving a resource with some criterion it was failing.

Browse source
This commit is contained in:
Óscar González Fernández 2009-11-25 17:25:28 +01:00
parent 402cfa81e2
commit 04f9898540
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java
View file

@ -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);

4
navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java
View file

@ -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);