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

Merge branch release/21.7.7 of zentao/zentaopms (#12280)

Browse Source
This commit is contained in:
刘刚
2025-11-11 17:34:46 +08:00
committed by Gitfox
parent 991ba08070 3c23ee24eb
commit 31f06c81cc
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+1 -1
View File
@@ -3553,7 +3553,7 @@ class taskModel extends model
public function updateParentStatus(int $taskID, int $parentID = 0, bool $createAction = true) :void
{
/* Get child task info. */
$childTask = $this->dao->select('id,assignedTo,parent,path')->from(TABLE_TASK)->where('id')->eq($taskID)->fetch();
$childTask = $this->dao->select('id,assignedTo,parent,path,realStarted')->from(TABLE_TASK)->where('id')->eq($taskID)->fetch();
if(empty($childTask)) return;
$taskIdList = $childTask->path;
module/task/tao.php
+1
View File
@@ -1032,6 +1032,7 @@ class taskTao extends taskModel
$data->assignedTo = !empty($childTask) ? $childTask->assignedTo : $task->openedBy;
$data->assignedDate = $now;
}
if($status == 'doing' && !empty($childTask->realStarted)) $data->realStarted = $childTask->realStarted;
$data->finishedBy = '';
$data->finishedDate = null;
module/task/test/tao/autoupdatetaskbystatus.php
+3 -1
View File
@@ -64,7 +64,9 @@ su('user4');
$task = new taskTest();
zenData('task')->gen(10);
$taskTable = zenData('task');
$taskTable->story->range(0);
$taskTable->gen(10);
$parentTask = new stdclass();
$parentTask->id = 1;
module/testcase/config/table.php
+5 -4
View File
@@ -83,10 +83,11 @@ $config->testcase->dtable->fieldList['openedDate']['type'] = 'date';
$config->testcase->dtable->fieldList['openedDate']['group'] = 4;
$config->testcase->dtable->fieldList['openedDate']['sortType'] = true;
$config->testcase->dtable->fieldList['reviewedBy']['title'] = $lang->testcase->reviewedByAB;
$config->testcase->dtable->fieldList['reviewedBy']['type'] = 'user';
$config->testcase->dtable->fieldList['reviewedBy']['group'] = 4;
$config->testcase->dtable->fieldList['reviewedBy']['sortType'] = true;
$config->testcase->dtable->fieldList['reviewedBy']['title'] = $lang->testcase->reviewedByAB;
$config->testcase->dtable->fieldList['reviewedBy']['type'] = 'user';
$config->testcase->dtable->fieldList['reviewedBy']['group'] = 4;
$config->testcase->dtable->fieldList['reviewedBy']['sortType'] = true;
$config->testcase->dtable->fieldList['reviewedBy']['delimiter'] = true;
$config->testcase->dtable->fieldList['reviewedDate']['title'] = $lang->testcase->reviewedDate;
$config->testcase->dtable->fieldList['reviewedDate']['type'] = 'date';