From 71082a7470a3912f55afa5ddc519ff6565cebc7d Mon Sep 17 00:00:00 2001 From: Diego Pino Garcia Date: Fri, 15 Apr 2011 13:29:03 +0200 Subject: [PATCH] [Bug #987] Don't select hour type if there are no items in the list of hours type FEA: ItEr74S04BugFixing --- .../web/costcategories/CostCategoryCRUDController.java | 5 +++++ .../web/workreports/WorkReportCRUDController.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java index 939af9157..c33bbe16e 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java @@ -268,6 +268,11 @@ public class CostCategoryCRUDController extends GenericForwardComposer lbHoursType.renderAll(); lbHoursType.applyProperties(); + if (lbHoursType.getItems().isEmpty()) { + row.appendChild(lbHoursType); + return; + } + // First time is rendered, select first item TypeOfWorkHours type = hourCost.getType(); if (hourCost.isNewObject() && type == null) { 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 8a2bd54cc..505feba88 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 @@ -1169,6 +1169,11 @@ public class WorkReportCRUDController extends GenericForwardComposer implements lbHoursType.renderAll(); lbHoursType.applyProperties(); + if (lbHoursType.getItems().isEmpty()) { + row.appendChild(lbHoursType); + return; + } + // First time is rendered, select first item TypeOfWorkHours type = workReportLine.getTypeOfWorkHours(); if (workReportLine.isNewObject() && type == null) {