diff --git a/module/action/lang/de.php b/module/action/lang/de.php
index 7e0ee16529..909bc81a19 100644
--- a/module/action/lang/de.php
+++ b/module/action/lang/de.php
@@ -245,10 +245,6 @@ $lang->action->desc->linkbug = '$date, $actor link bugs action->desc->unlinkstory = '$date, $actor remove stories $extra from plan.' . "\n";
$lang->action->desc->unlinkbug = '$date, $actor remove bugs $extra from plan.' . "\n";
-/* Used to describe the historical operation records of gantt. */
-$lang->action->desc->ganttdrag = '$date, $actor tasks dragged $extra.' . "\n";
-$lang->action->desc->ganttmove = '$date, $actor tasks sorted $extra.' . "\n";
-
/* Used to display dynamic information. */
$lang->action->label = new stdclass();
$lang->action->label->install = 'install ';
@@ -386,8 +382,6 @@ $lang->action->label->unlinkstory = 'unlink stories from';
$lang->action->label->unlinkbug = 'unlink bugs from';
$lang->action->label->tolib = 'imported';
$lang->action->label->updatetolib = 'updated';
-$lang->action->label->ganttdrag = 'dragged';
-$lang->action->label->ganttmove = 'sorted';
/* Dynamic information is grouped by object. */
$lang->action->dynamicAction = new stdclass;
diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index 9a2d0e1634..a88734522b 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -245,10 +245,6 @@ $lang->action->desc->linkbug = '$date, $actor link bugs action->desc->unlinkstory = '$date, $actor remove stories $extra from plan.' . "\n";
$lang->action->desc->unlinkbug = '$date, $actor remove bugs $extra from plan.' . "\n";
-/* Used to describe the historical operation records of gantt. */
-$lang->action->desc->ganttdrag = '$date, $actor tasks dragged $extra.' . "\n";
-$lang->action->desc->ganttmove = '$date, $actor tasks sorted $extra.' . "\n";
-
/* Used to display dynamic information. */
$lang->action->label = new stdclass();
$lang->action->label->install = 'install ';
@@ -386,8 +382,6 @@ $lang->action->label->unlinkstory = 'unlink stories from';
$lang->action->label->unlinkbug = 'unlink bugs from';
$lang->action->label->tolib = 'imported';
$lang->action->label->updatetolib = 'updated';
-$lang->action->label->ganttdrag = 'dragged';
-$lang->action->label->ganttmove = 'sorted';
/* Dynamic information is grouped by object. */
$lang->action->dynamicAction = new stdclass;
diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php
index 3f9c6bc522..b0cd6a60d6 100644
--- a/module/action/lang/fr.php
+++ b/module/action/lang/fr.php
@@ -245,10 +245,6 @@ $lang->action->desc->linkbug = '$date, $actor link bugs action->desc->unlinkstory = '$date, $actor remove stories $extra from plan.' . "\n";
$lang->action->desc->unlinkbug = '$date, $actor remove bugs $extra from plan.' . "\n";
-/* Used to describe the historical operation records of gantt. */
-$lang->action->desc->ganttdrag = '$date, $actor tasks dragged $extra.' . "\n";
-$lang->action->desc->ganttmove = '$date, $actor tasks sorted $extra.' . "\n";
-
/* Used to display dynamic information. */
$lang->action->label = new stdclass();
$lang->action->label->install = 'install ';
@@ -386,8 +382,6 @@ $lang->action->label->unlinkstory = 'unlink stories from';
$lang->action->label->unlinkbug = 'unlink bugs from';
$lang->action->label->tolib = 'Importé';
$lang->action->label->updatetolib = 'MàJ';
-$lang->action->label->ganttdrag = 'dragged';
-$lang->action->label->ganttmove = 'sorted';
/* Dynamic information is grouped by object. */
$lang->action->dynamicAction = new stdclass();
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index af8c1ee524..ae7ce48891 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -245,10 +245,6 @@ $lang->action->desc->linkbug = '$date, 由 $actor 关联BUG
$lang->action->desc->unlinkstory = '$date, 由 $actor 从计划移除需求 $extra。' . "\n";
$lang->action->desc->unlinkbug = '$date, 由 $actor 从计划移除BUG $extra。' . "\n";
-/* 用来描述gantt chat相关操作记录。 */
-$lang->action->desc->ganttdrag = '$date, 由 $actor 拖动了任务 $extra。' . "\n";
-$lang->action->desc->ganttmove = '$date, 由 $actor 排序了任务 $extra。' . "\n";
-
/* 用来显示动态信息。*/
$lang->action->label = new stdclass();
$lang->action->label->install = '安装';
@@ -386,8 +382,6 @@ $lang->action->label->unlinkstory = '移除需求从';
$lang->action->label->unlinkbug = '移除BUG从';
$lang->action->label->tolib = '导入了';
$lang->action->label->updatetolib = '更新了';
-$lang->action->label->ganttdrag = '拖动了';
-$lang->action->label->ganttmove = '排序了';
/* 动态信息按照对象分组 */
$lang->action->dynamicAction = new stdclass();
diff --git a/module/programplan/control.php b/module/programplan/control.php
index fa727343c4..1c02e0aae5 100644
--- a/module/programplan/control.php
+++ b/module/programplan/control.php
@@ -275,7 +275,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', '', $this->app->user->account);
+
return $this->send(array('result' => 'success'));
}
}
diff --git a/module/task/model.php b/module/task/model.php
index a26082c9f5..b18bebe2fd 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -3936,6 +3936,9 @@ class taskModel extends model
$this->app->loadLang('project');
$post = fixer::input('post')->get();
$post->endDate = date('Y-m-d', strtotime('-1 day', strtotime($post->endDate)));
+ $changeTable = $objectType == 'task' ? TABLE_TASK : TABLE_PROJECT;
+ $actionType = $objectType == 'task' ? 'task' : 'execution';
+ $oldObject = $this->dao->select('*')->from($changeTable)->where('id')->eq($objectID)->fetch();
if($objectType == 'task')
{
$objectData = $this->dao->select('*')->from(TABLE_TASK)->where('id')->eq($objectID)->fetch();
@@ -4019,7 +4022,12 @@ class taskModel extends model
{
return false;
}
-
+
+ $newObject = $this->dao->select('*')->from($changeTable)->where('id')->eq($objectID)->fetch();
+ $changes = common::createChanges($oldObject, $newObject);
+ $actionID = $this->loadModel('action')->create($actionType, $objectID, 'edited');
+ if(!empty($changes)) $this->loadModel('action')->logHistory($actionID, $changes);
+
return true;
}