diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java
index f781ca11c..f21ee43ed 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java
@@ -126,12 +126,12 @@ public abstract class BaseCalendarEditionController extends
prepareParentCombo();
}
prepareExceptionTypeCombo();
- exceptionDurationPicker = addEffortDurationPickerAtDurationRow(comp);
+ exceptionDurationPicker = addEffortDurationPickerAtWorkableTimeRow(comp);
}
- private EffortDurationPicker addEffortDurationPickerAtDurationRow(
+ private EffortDurationPicker addEffortDurationPickerAtWorkableTimeRow(
Component comp) {
- Component container = comp.getFellow("exceptionDayDurationRow");
+ Component container = comp.getFellow("exceptionDayWorkableTimeRow");
EffortDurationPicker result = new EffortDurationPicker();
result.setValue(EffortDuration.zero());
container.appendChild(result);
diff --git a/navalplanner-webapp/src/main/webapp/calendars/_edition.zul b/navalplanner-webapp/src/main/webapp/calendars/_edition.zul
index 2c4b72ccc..cfffca60d 100644
--- a/navalplanner-webapp/src/main/webapp/calendars/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/calendars/_edition.zul
@@ -106,8 +106,8 @@
-
-
+
+
@@ -119,7 +119,7 @@
-
+
@@ -148,7 +148,7 @@
itemRenderer="@{calendarController.editionController.hoursPerDayRenderer}">
-
+