resolve conflict

module/programplan/view/gantt.html.php

@@ -479,7 +479,6 @@ $(function()
     gantt.config.order_branch        = ganttType == 'assignedTo' ? false : 'marker';
     gantt.config.drag_progress       = false;
     gantt.config.drag_links          = false;
-    gantt.config.drag_resize         = false;
     gantt.config.smart_rendering     = true;
     gantt.config.smart_scales        = true;
     gantt.config.static_background   = true;
@@ -643,18 +642,20 @@ $(function()
         var link = createLink('programplan', 'ajaxSaveGanttMove');
 
         //prevent moving to another position.
-        if(task.parent != parent || id.indexOf('-') == -1) return false;
-
-        $.ajax({
+        if(task.parent != parent || id.indexOf('-') == -1)
+        {
+            return false;
+        }
+        else
+        {
+            $.ajax({
             url: link,
-            dataType: "json",
-            data: {id: id, type: task.type, order: tindex},
-            type: "post",
-            success: function(result)
-            {
-                var target = result;
-            }
-        });
+                dataType: "json",
+                data: {id: id, type: task.type, index: tindex},
+                type: "post",
+                success: function(result){}
+            });
+        }
 
         return true;
     });