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

* [task#130379,doing,0.5h] Process task to bug.

Browse Source
This commit is contained in:
xieqiyu
2024-10-21 10:43:46 +08:00
committed by 胡方舟
parent bedea883b9
commit 0787bae1da
2 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/model.php
+18 -7
View File
@@ -339,25 +339,36 @@ class bugModel extends model
if($this->config->edition != 'open')
{
if($oldBug->story > 0)
if($oldBug->story > 0 || $oldBug->task > 0)
{
$AID = $oldBug->story > 0 ? ($oldBug->task > 0 ? "{$oldBug->story},{$oldBug->task}" : $oldBug->story) : $oldBug->task;
$AType = $oldBug->story > 0 ? ($oldBug->task > 0 ? 'story,task' : 'story') : 'task';
$this->dao->delete()->from(TABLE_RELATION)
->where('relation')->eq('generated')
->andWhere('AID')->eq($oldBug->story)
->andWhere('AType')->eq('story')
->andWhere('AID')->in($AID)
->andWhere('AType')->in($AType)
->andWhere('BID')->eq($oldBug->id)
->andWhere('BType')->eq('bug')
->exec();
}
if($bug->story > 0)
if($bug->story > 0 || $bug->task > 0)
{
$relation = new stdClass();
$relation->AID = $bug->story;
$relation->AType = 'story';
$relation->relation = 'generated';
$relation->BID = $bug->id;
$relation->BType = 'bug';
$this->dao->replace(TABLE_RELATION)->data($relation)->exec();
if($bug->story > 0)
{
$relation->AID = $bug->story;
$relation->AType = 'story';
$this->dao->replace(TABLE_RELATION)->data($relation)->exec();
}
if($bug->task > 0)
{
$relation->AID = $bug->task;
$relation->AType = 'task';
$this->dao->replace(TABLE_RELATION)->data($relation)->exec();
}
}
}