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

* [task#131935,doing,0.5h] change parent = -1 to isParent.

Browse Source
This commit is contained in:
sunguangming
2024-11-06 14:00:28 +08:00
committed by 王怡栋
parent 9e1b7cef66
commit 08d6be41fc
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+9 -6
View File
@@ -34,7 +34,7 @@ class taskModel extends model
}
$oldTask = $this->getById($taskID);
if($oldTask->parent == '-1') $this->config->task->activate->requiredFields = '';
if($oldTask->isParent) $this->config->task->activate->requiredFields = '';
$this->dao->update(TABLE_TASKTEAM)->set('status')->eq('wait')->where('task')->eq($task->id)->andWhere('consumed')->eq(0)->andWhere('left')->gt('0')->exec();
$this->dao->update(TABLE_TASKTEAM)->set('status')->eq('doing')->where('task')->eq($task->id)->andWhere('consumed')->gt(0)->andWhere('left')->gt(0)->exec();
@@ -62,7 +62,7 @@ class taskModel extends model
if($task->left != $oldTask->left) $this->loadModel('program')->refreshProjectStats($oldTask->project);
if($oldTask->parent > 0) $this->updateParentStatus($taskID);
if($oldTask->parent == '-1')
if($oldTask->isParent)
{
unset($task->left);
unset($task->id);
@@ -180,7 +180,7 @@ class taskModel extends model
$this->feedback->updateStatus('task', $oldTask->feedback, $task->status, $oldTask->status);
}
if(!empty($task->story) && !empty($task->parent) && $task->parent == '-1' && $this->post->syncChildren) $this->syncStoryToChildren($task);
if(!empty($task->story) && !empty($task->isParent) && $this->post->syncChildren) $this->syncStoryToChildren($task);
}
return !dao::isError();
@@ -286,7 +286,7 @@ class taskModel extends model
}
$parentTask = new stdclass();
$parentTask->parent = '-1';
$parentTask->isParent = 1;
$parentTask->lastEditedBy = $this->app->user->account;
$parentTask->lastEditedDate = helper::now();
$this->dao->update(TABLE_TASK)->data($parentTask)->where('id')->eq($parentID)->exec();
@@ -655,7 +655,7 @@ class taskModel extends model
if($oldTask->parent > 0) $this->updateParentStatus($task->id);
/* Cancel a parent task. */
if($oldTask->parent == '-1') $this->taskTao->cancelParentTask($task);
if($oldTask->isParent) $this->taskTao->cancelParentTask($task);
if($oldTask->story) $this->loadModel('story')->setStage($oldTask->story);
@@ -808,6 +808,9 @@ class taskModel extends model
if(!empty($latestDeadline)) $newTask['deadline'] = $latestDeadline;
if(!empty($newTask)) $this->dao->update(TABLE_TASK)->data($newTask)->autoCheck()->where('id')->eq($taskID)->exec();
$task = $this->fetchById($taskID);
if($task->parent) $this->computeBeginAndEnd($task->parent);
return !dao::isError();
}
@@ -1070,7 +1073,7 @@ class taskModel extends model
$this->createTestChildTasks($taskID, $testTasks);
$this->computeWorkingHours($taskID);
$this->computeBeginAndEnd($taskID);
$this->dao->update(TABLE_TASK)->set('`parent`')->eq(-1)->where('id')->eq($taskID)->exec();
$this->dao->update(TABLE_TASK)->set('isParent')->eq(1)->where('id')->eq($taskID)->exec();
}
if(dao::isError()) return false;