From b48e7bdca4af40c5dd45873bbfcd995d1659f2a8 Mon Sep 17 00:00:00 2001 From: Diego Pino Garcia Date: Wed, 11 Nov 2009 11:37:16 +0100 Subject: [PATCH] ItEr34S08ValidacionEProbasFuncionaisItEr33S08: [Bug #76] Solved bug on deleting WorkReportLine if Resource or OrderElement are null --- .../web/workreports/WorkReportCRUDController.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java index 26c389e48..d1dbb7e64 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java @@ -33,6 +33,7 @@ import org.hibernate.validator.InvalidValue; import org.navalplanner.business.common.exceptions.InstanceNotFoundException; import org.navalplanner.business.common.exceptions.ValidationException; import org.navalplanner.business.orders.entities.Order; +import org.navalplanner.business.orders.entities.OrderElement; import org.navalplanner.business.resources.entities.Criterion; import org.navalplanner.business.resources.entities.CriterionType; import org.navalplanner.business.resources.entities.Worker; @@ -103,6 +104,7 @@ public class WorkReportCRUDController extends GenericForwardComposer implements private final static int PAGING = 10; + private static final String ITEM = "item"; @Override public void doAfterCompose(Component comp) throws Exception { @@ -586,9 +588,13 @@ public class WorkReportCRUDController extends GenericForwardComposer implements } private String getWorkReportLineName(WorkReportLine workReportLine) { - final String resourceName = ((Worker) workReportLine.getResource()).getName(); - final String code = workReportLine.getOrderElement().getCode(); - return resourceName + " - " + code; + final Worker resource = (Worker) workReportLine.getResource(); + final OrderElement orderElement = workReportLine.getOrderElement(); + + if (resource == null || orderElement == null) { + return ITEM; + } + return resource.getName() + " - " + orderElement.getCode(); } /**