diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/Planner.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/Planner.java index 9ecec5e68..5ddccf1a2 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/Planner.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/Planner.java @@ -123,7 +123,6 @@ public class Planner extends XulElement implements AfterCompose { public void addTask(TaskBean newTask) { getTaskList().addTask(newTask); - getDependencyList().invalidate(); dependencyRegistry.add(newTask); } diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskList.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskList.java index 4bd83bc18..fc2030cc5 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskList.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskList.java @@ -76,12 +76,11 @@ public class TaskList extends XulElement implements AfterCompose { } public void addTask(TaskBean newTask) { - addTask(Task.asTask(newTask)); + addTask(Task.asTask(newTask), true); } - public synchronized void addTask(Task task) { + public synchronized void addTask(final Task task, boolean relocate) { task.setParent(this); - invalidate(); addContextMenu(task); addListenerForTaskEditForm(task); ListIterator> iterator = listeners @@ -95,6 +94,9 @@ public class TaskList extends XulElement implements AfterCompose { } } task.afterCompose(); + if (relocate) { + response(null, new AuInvoke(task, "recolocateAfterAdding")); + } } private void addListenerForTaskEditForm(final Task task) { @@ -187,7 +189,7 @@ public class TaskList extends XulElement implements AfterCompose { @Override public void afterCompose() { for (TaskBean taskBean : originalTasks) { - addTask(Task.asTask(taskBean)); + addTask(Task.asTask(taskBean), false); } if (zoomLevelChangedListener == null) { zoomLevelChangedListener = new ZoomLevelChangedListener() { diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/task.dsp b/navalplanner-gantt-zk/src/main/resources/web/ganttz/task.dsp index 6099299eb..b3238f499 100755 --- a/navalplanner-gantt-zk/src/main/resources/web/ganttz/task.dsp +++ b/navalplanner-gantt-zk/src/main/resources/web/ganttz/task.dsp @@ -4,9 +4,10 @@ +
${self.taskName}
-
\ No newline at end of file + diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/tasklist.dsp b/navalplanner-gantt-zk/src/main/resources/web/ganttz/tasklist.dsp index f884c9c91..71000e598 100644 --- a/navalplanner-gantt-zk/src/main/resources/web/ganttz/tasklist.dsp +++ b/navalplanner-gantt-zk/src/main/resources/web/ganttz/tasklist.dsp @@ -24,7 +24,8 @@ diff --git a/navalplanner-gantt-zk/src/main/resources/web/js/ganttz/task.js b/navalplanner-gantt-zk/src/main/resources/web/js/ganttz/task.js index aa11a90c2..9518284e4 100755 --- a/navalplanner-gantt-zk/src/main/resources/web/js/ganttz/task.js +++ b/navalplanner-gantt-zk/src/main/resources/web/js/ganttz/task.js @@ -23,6 +23,13 @@ zkTask.getDD = function(cmp) { return cmp.created_dd; } +zkTask.recolocateAfterAdding = function(cmp){ + var row = cmp.parentNode; + var taskList = row.parentNode.parentNode; + row.parentNode.removeChild(row); + taskList.appendChild(row); +} + zkTask.init = function(cmp) { // Configure the drag&drop over the component var dd = zkTask.getDD(cmp); @@ -83,7 +90,6 @@ zkTask.init = function(cmp) { }, zkTask, true); - }; zkTask.xMouse;