diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index f3a4d1a7cc..351a2443c0 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -245,6 +245,8 @@ $lang->action->desc->linkbug = '$date, 由 $actor 关联BUG
$lang->action->desc->unlinkstory = '$date, 由 $actor 从计划移除需求 $extra。' . "\n";
$lang->action->desc->unlinkbug = '$date, 由 $actor 从计划移除BUG $extra。' . "\n";
+$lang->action->desc->ganttdrag = '$date, 由 $actor 拖动了任务 $extra';
+
/* 用来显示动态信息。*/
$lang->action->label = new stdclass();
$lang->action->label->install = '安装';
@@ -382,6 +384,7 @@ $lang->action->label->unlinkstory = '移除需求从';
$lang->action->label->unlinkbug = '移除BUG从';
$lang->action->label->tolib = '导入了';
$lang->action->label->updatetolib = '更新了';
+$lang->action->label->ganttdrag = '拖动了';
/* 动态信息按照对象分组 */
$lang->action->dynamicAction = new stdclass();
diff --git a/module/programplan/control.php b/module/programplan/control.php
index 89e0016296..240a7919a5 100644
--- a/module/programplan/control.php
+++ b/module/programplan/control.php
@@ -266,6 +266,7 @@ class programplan extends control
$this->loadModel('task')->updateEsDateByGantt($objectID, $_POST['type']);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
+ $this->loadModel('action')->create('task', $objectID, 'ganttDrag', json_encode($_POST), $this->app->user->account);
return $this->send(array('result' => 'success'));
}
}
diff --git a/module/programplan/view/gantt.html.php b/module/programplan/view/gantt.html.php
index 2fd66b8d18..fe8dfcf64c 100644
--- a/module/programplan/view/gantt.html.php
+++ b/module/programplan/view/gantt.html.php
@@ -485,7 +485,7 @@ $(function()
gantt.config.readonly = canGanttEdit ? false : true;
gantt.config.details_on_dblclick = false;
- gantt.config.order_branch = ganttType == 'assignedTo' ? false : 'marker';
+ gantt.config.order_branch = ganttType == 'assignedTo' ? false : true;
gantt.config.drag_progress = false;
gantt.config.drag_links = false;
gantt.config.drag_move = ganttType == 'assignedTo' ? false : true;
@@ -649,6 +649,7 @@ $(function()
gantt.attachEvent("onBeforeRowDragEnd", function(id, parent, tindex)
{
+ console.log(gantt.getChildren(gantt.getTask(id).parent))
var task = gantt.getTask(id);
var link = createLink('programplan', 'ajaxResponseGanttMoveEvent');
@@ -671,6 +672,7 @@ $(function()
return true;
});
+
// Make folder can open or close by click
$('#ganttView').on('click', '.gantt_close,.gantt_open', function()
{