Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug #15146.

Browse Source
This commit is contained in:
zhouxudong
2022-04-11 09:50:59 +08:00
parent afe486b631
commit 5e5f3c50d1
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/control.php
+12 -1
View File
@@ -1455,7 +1455,11 @@ class task extends control
}
/* Skip parent task when batch close task. */
if($task->parent == '-1') continue;
if(empty($parentTaskIdList) and ($task->parent == '-1'))
{
$parentTasks[$taskID] = $taskID;
continue;
}
/* Skip closed task when batch close task. */
if($task->status == 'closed') continue;
@@ -1474,6 +1478,13 @@ class task extends control
$cancelURL = $this->server->HTTP_REFERER;
return print(js::confirm(sprintf($this->lang->task->error->skipClose, $skipTasks), $confirmURL, $cancelURL, 'self', 'parent'));
}
if(isset($parentTasks) and empty($parentTaskIdList))
{
$parentTasks = join(',', $parentTasks);
return print(js::alert(sprintf($this->lang->task->error->closeParent, $parentTasks)) . js::reload('parent'));
}
if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther');
}