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

Merge branch 'sprint/master_zhouxudong_15146' into 'master'

Browse Source 
Sprint/master zhouxudong 15146

See merge request easycorp/zentaopms!2855
This commit is contained in:
李玉春
2022-04-11 06:14:39 +00:00
parent 74af01c97a 36e1809e7c
commit ecf6797cb2
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/control.php
+13 -2
View File
@@ -1452,7 +1452,11 @@ class task extends control
}
/* Skip parent task when batch close task. */
if($task->parent == '-1') continue;
if($task->parent == '-1')
{
$parentTasks[$taskID] = $taskID;
continue;
}
/* Skip closed task when batch close task. */
if($task->status == 'closed') continue;
@@ -1466,11 +1470,18 @@ class task extends control
}
if(isset($skipTasks) and empty($skipTaskIdList))
{
$skipTasks = join(',', $skipTasks);
$skipTasks = join(',', $skipTasks);
$confirmURL = $this->createLink('task', 'batchClose', "skipTaskIdList=$skipTasks");
$cancelURL = $this->server->HTTP_REFERER;
return print(js::confirm(sprintf($this->lang->task->error->skipClose, $skipTasks), $confirmURL, $cancelURL, 'self', 'parent'));
}
if(isset($parentTasks))
{
$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');
}