diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/TaskEditFormComposer.java b/ganttzk/src/main/java/org/zkoss/ganttz/TaskEditFormComposer.java index 0ed20cf93..c0ea6b0a2 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/TaskEditFormComposer.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/TaskEditFormComposer.java @@ -71,7 +71,13 @@ public class TaskEditFormComposer extends GenericForwardComposer { public void accept() { if (currentTask != null) { - copyFromDTO(taskDTO, currentTask); + copyFromDTO(taskDTO, currentTask, true); + } + } + + public void acceptWithoutCopyingDates() { + if (currentTask != null) { + copyFromDTO(taskDTO, currentTask, false); } } @@ -105,10 +111,13 @@ public class TaskEditFormComposer extends GenericForwardComposer { return result; } - private void copyFromDTO(TaskDTO taskDTO, Task currentTask) { + private void copyFromDTO(TaskDTO taskDTO, Task currentTask, + boolean copyDates) { currentTask.setName(taskDTO.name); - currentTask.setBeginDate(GanttDate.createFrom(taskDTO.beginDate)); - currentTask.resizeTo(GanttDate.createFrom(taskDTO.endDate)); + if (copyDates) { + currentTask.setBeginDate(GanttDate.createFrom(taskDTO.beginDate)); + currentTask.resizeTo(GanttDate.createFrom(taskDTO.endDate)); + } currentTask.setNotes(taskDTO.notes); currentTask.setDeadline(taskDTO.deadlineDate); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java index 78d29621f..7fb034446 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java @@ -408,7 +408,7 @@ public class TaskPropertiesController extends GenericForwardComposer { ok = saveConstraintChanges(); } if (ok) { - taskEditFormComposer.accept(); + taskEditFormComposer.acceptWithoutCopyingDates(); } }