diff --git a/module/action/lang/en.php b/module/action/lang/en.php index b971bdd570..e76cc268d3 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -137,6 +137,7 @@ $lang->action->desc->linkchildtask = '$date, $actor linked $lang->action->desc->unlinkchildrentask = '$date, $actor unlinked a child task $extra。' . "\n"; $lang->action->desc->linkparenttask = '$date, $actor linked to a parent task $extra。' . "\n"; $lang->action->desc->unlinkparenttask = '$date, $actor unlinked a parent task $extra。' . "\n"; +$lang->action->desc->deletechildrentask = '$date, $actor deleted a child task $extra。' . "\n"; /* Historical record of actions when associating and removing cases. */ $lang->action->desc->linkrelatedcase = '$date, $actor linked a case $extra.' . "\n"; @@ -209,6 +210,7 @@ $lang->action->label->unlinkparenttask = "unlink from parent task"; $lang->action->label->batchcreate = "batch created tasks"; $lang->action->label->createchildren = "create child tasks"; $lang->action->label->managed = "managed"; +$lang->action->label->deletechildrentask = "delete children task"; /* Dynamic information is grouped by object. */ $lang->action->dynamicAction = new stdclass; @@ -281,6 +283,7 @@ $lang->action->dynamicAction->task['canceled'] = 'Cancel Task'; $lang->action->dynamicAction->task['activated'] = 'Activate Task'; $lang->action->dynamicAction->task['createchildren'] = 'Create Child Task'; $lang->action->dynamicAction->task['unlinkparenttask'] = 'Unlink Parent Task'; +$lang->action->dynamicAction->task['deletechildrentask'] = 'Delete children task'; $lang->action->dynamicAction->task['linkparenttask'] = 'Link Parent Task'; $lang->action->dynamicAction->task['linkchildtask'] = 'Link Child Task'; $lang->action->dynamicAction->task['undeleted'] = 'Restore Task'; diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index e6d26c50d3..c5315de6ef 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -137,6 +137,7 @@ $lang->action->desc->linkchildtask = '$date, 由 $actor $lang->action->desc->unlinkchildrentask = '$date, 由 $actor 移除子任务 $extra。' . "\n"; $lang->action->desc->linkparenttask = '$date, 由 $actor 关联到父任务 $extra。' . "\n"; $lang->action->desc->unlinkparenttask = '$date, 由 $actor 从父任务$extra取消关联。' . "\n"; +$lang->action->desc->deletechildrentask = '$date, 由 $actor 删除子任务$extra。' . "\n"; /* 关联用例和移除用例时的历史操作记录。*/ $lang->action->desc->linkrelatedcase = '$date, 由 $actor 关联相关用例 $extra。' . "\n"; @@ -209,6 +210,7 @@ $lang->action->label->unlinkparenttask = "从父任务取消关联"; $lang->action->label->batchcreate = "批量创建任务"; $lang->action->label->createchildren = "创建子任务"; $lang->action->label->managed = "维护"; +$lang->action->label->deletechildrentask = "删除子任务"; /* 动态信息按照对象分组 */ $lang->action->dynamicAction = new stdclass(); @@ -281,6 +283,7 @@ $lang->action->dynamicAction->task['canceled'] = '取消任务'; $lang->action->dynamicAction->task['activated'] = '激活任务'; $lang->action->dynamicAction->task['createchildren'] = '创建子任务'; $lang->action->dynamicAction->task['unlinkparenttask'] = '从父任务取消关联'; +$lang->action->dynamicAction->task['deletechildrentask'] = '删除子任务'; $lang->action->dynamicAction->task['linkparenttask'] = '关联到父任务'; $lang->action->dynamicAction->task['linkchildtask'] = '关联子任务'; $lang->action->dynamicAction->task['undeleted'] = '还原任务'; diff --git a/module/action/model.php b/module/action/model.php index 304f139054..7f9fc54d06 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -303,7 +303,7 @@ class actionModel extends model } $action->extra = trim(trim($action->extra), ','); } - elseif($actionName == 'totask' or $actionName == 'linkchildtask' or $actionName == 'unlinkchildrentask' or $actionName == 'linkparenttask' or $actionName == 'unlinkparenttask') + elseif($actionName == 'totask' or $actionName == 'linkchildtask' or $actionName == 'unlinkchildrentask' or $actionName == 'linkparenttask' or $actionName == 'unlinkparenttask' or $actionName == 'deletechildrentask') { $name = $this->dao->select('name')->from(TABLE_TASK)->where('id')->eq($action->extra)->fetch('name'); if($name) $action->extra = common::hasPriv('task', 'view') ? html::a(helper::createLink('task', 'view', "taskID=$action->extra"), "#$action->extra " . $name) : "#$action->extra " . $name; diff --git a/module/task/control.php b/module/task/control.php index 603b8fe9e2..2614415927 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -1168,7 +1168,11 @@ class task extends control else { $this->task->delete(TABLE_TASK, $taskID); - if($task->parent > 0) $this->task->updateParentStatus($task->id); + if($task->parent > 0) + { + $this->task->updateParentStatus($task->id); + $this->loadModel('action')->create('task', $task->parent, 'deleteChildrenTask', '', $taskID); + } if($task->fromBug != 0) $this->dao->update(TABLE_BUG)->set('toTask')->eq(0)->where('id')->eq($task->fromBug)->exec(); if($task->story) $this->loadModel('story')->setStage($task->story);