* Fix bug#15146.

This commit is contained in:
xieqiyu
2022-04-11 14:07:49 +08:00
parent 5e5f3c50d1
commit 93cb0c08bf
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -1455,7 +1455,7 @@ class task extends control
}
/* Skip parent task when batch close task. */
if(empty($parentTaskIdList) and ($task->parent == '-1'))
if($task->parent == '-1')
{
$parentTasks[$taskID] = $taskID;
continue;
@@ -1479,7 +1479,7 @@ class task extends control
return print(js::confirm(sprintf($this->lang->task->error->skipClose, $skipTasks), $confirmURL, $cancelURL, 'self', 'parent'));
}
if(isset($parentTasks) and empty($parentTaskIdList))
if(isset($parentTasks))
{
$parentTasks = join(',', $parentTasks);
return print(js::alert(sprintf($this->lang->task->error->closeParent, $parentTasks)) . js::reload('parent'));
+1 -1
View File
@@ -236,7 +236,7 @@ $lang->task->error->left = '请填写"剩余"';
$lang->task->error->work = '"备注"必须小于%d个字符';
$lang->task->error->teamMember = '团队成员必须不少于2人';
$lang->task->error->skipClose = '任务:%s 不是“已完成”或“已取消”状态,确定要关闭吗?';
$lang->task->error->closeParent = '任务:%s 是父任务,父任务在其产生的所有子任务关闭后会自动关闭,无法手动关闭。';
$lang->task->error->closeParent = '任务:%s 是父任务,父任务在所有子任务关闭后会自动关闭,无法手动关闭。';
$lang->task->error->consumed = '任务:%s工时不能小于0,忽略该任务工时的改动';
$lang->task->error->assignedTo = '当前状态的多人任务不能指派给任务团队外的成员。';
$lang->task->error->consumedEmpty = '"本次消耗"不能为0';