From 43d6c515a62ae713f9f606bfa131b9f9ff70185e Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Wed, 8 Jan 2025 10:47:59 +0800 Subject: [PATCH] * [misc] Fix the bug of the error of "The product field is required.". --- module/bug/model.php | 1 + module/build/control.php | 2 ++ module/execution/model.php | 1 + module/mail/tao.php | 2 +- module/repo/model.php | 1 + module/story/model.php | 2 ++ module/story/tao.php | 2 ++ module/task/model.php | 2 ++ module/testcase/tao.php | 1 + module/upgrade/model.php | 26 ++++++++++++++++++++++++-- 10 files changed, 37 insertions(+), 3 deletions(-) diff --git a/module/bug/model.php b/module/bug/model.php index b58b43e8ce..a099bf2bb9 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -364,6 +364,7 @@ class bugModel extends model $relation->relation = 'generated'; $relation->BID = $bug->id; $relation->BType = 'bug'; + $relation->product = 0; if($bug->story > 0) { $relation->AID = $bug->story; diff --git a/module/build/control.php b/module/build/control.php index d977fcc750..7282480f5e 100644 --- a/module/build/control.php +++ b/module/build/control.php @@ -415,6 +415,8 @@ class build extends control if(!empty($_POST['stories'])) { if($this->post->stories) $this->build->linkStory($buildID, $this->post->stories); + if(dao::isError()) return $this->sendError(dao::getError()); + return $this->send(array('result' => 'success', 'load' => $this->createLink($this->app->rawModule, 'view', "buildID=$buildID&type=story"))); } diff --git a/module/execution/model.php b/module/execution/model.php index da6c990d7b..f40d298eb9 100755 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -2551,6 +2551,7 @@ class executionModel extends model $relation->relation = 'transferredto'; $relation->BType = 'task'; $relation->BID = $taskID; + $relation->product = 0; $this->dao->replace(TABLE_RELATION)->data($relation)->exec(); } } diff --git a/module/mail/tao.php b/module/mail/tao.php index 63b977107e..4c509c0cc5 100644 --- a/module/mail/tao.php +++ b/module/mail/tao.php @@ -192,7 +192,7 @@ class mailTao extends mailModel * @access protected * @return object */ - protected function getObjectForMail(string$objectType, int $objectID): object|false + protected function getObjectForMail(string $objectType, int $objectID): object|false { if(empty($objectType) || empty($objectID)) return false; diff --git a/module/repo/model.php b/module/repo/model.php index 0d9f5e23b7..ece7a0e61a 100644 --- a/module/repo/model.php +++ b/module/repo/model.php @@ -446,6 +446,7 @@ class repoModel extends model $relation->relation = 'commit'; $relation->BType = $type; $relation->BID = $linkID; + $relation->product = 0; /* record module related information. */ $this->loadModel($type)->updateLinkedCommits((int)$linkID, $repoID, [$revisionID]); diff --git a/module/story/model.php b/module/story/model.php index 179a012fa4..5646810131 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -2088,6 +2088,7 @@ class storyModel extends model $relation->AType = 'story'; $relation->BID = $taskID; $relation->BType = 'task'; + $relation->product = 0; $this->dao->replace(TABLE_RELATION)->data($relation)->exec(); } } @@ -2200,6 +2201,7 @@ class storyModel extends model $relation->relation = 'subdivideinto'; $relation->BID = $storyID; $relation->BType = $oldStory->type; + $relation->product = 0; $this->dao->replace(TABLE_RELATION)->data($relation)->exec(); } return $changes; diff --git a/module/story/tao.php b/module/story/tao.php index 3758e1d891..b9ca70a07a 100644 --- a/module/story/tao.php +++ b/module/story/tao.php @@ -868,6 +868,7 @@ class storyTao extends storyModel $relation->relation = 'subdivideinto'; $relation->BID = $oldStory->id; $relation->BType = $oldStory->type; + $relation->product = 0; $this->dao->replace(TABLE_RELATION)->data($relation)->exec(); } } @@ -1011,6 +1012,7 @@ class storyTao extends storyModel $relation->relation = 'transferredto'; $relation->BID = $storyID; $relation->BType = 'story'; + $relation->product = 0; $this->dao->replace(TABLE_RELATION)->data($relation)->exec(); } diff --git a/module/task/model.php b/module/task/model.php index 1abd3eb5b2..77b860e7b8 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -532,6 +532,7 @@ class taskModel extends model $relation->AType = 'story'; $relation->BID = $taskID; $relation->BType = 'task'; + $relation->product = 0; $this->dao->replace(TABLE_RELATION)->data($relation)->exec(); } } @@ -1133,6 +1134,7 @@ class taskModel extends model $relation->AType = 'story'; $relation->BID = $childTaskID; $relation->BType = 'task'; + $relation->product = 0; $this->dao->replace(TABLE_RELATION)->data($relation)->exec(); } $this->taskTao->updateRelation($childTaskID, (int)$taskID); diff --git a/module/testcase/tao.php b/module/testcase/tao.php index b710a25c3d..69e64d82a0 100644 --- a/module/testcase/tao.php +++ b/module/testcase/tao.php @@ -536,6 +536,7 @@ class testcaseTao extends testcaseModel $relation->AType = 'bug'; $relation->BID = $caseID; $relation->BType = 'testcase'; + $relation->product = 0; $this->dao->replace(TABLE_RELATION)->data($relation)->exec(); } } diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 82e798353f..f0f01599e6 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -9005,6 +9005,7 @@ class upgradeModel extends model $relation->BType = $storyType; $relation->BID = $linkStoryID; $relation->relation = 'linkedto'; + $relation->product = 0; $this->dao->replace(TABLE_RELATION)->data($relation)->exec(); @@ -9013,6 +9014,7 @@ class upgradeModel extends model $relation->BType = $storyType; $relation->BID = $storyID; $relation->relation = 'linkedfrom'; + $relation->product = 0; $this->dao->replace(TABLE_RELATION)->data($relation)->exec(); } @@ -10105,6 +10107,7 @@ class upgradeModel extends model $relation->relation = 1; $relation->BType = $story->BType; $relation->BID = $story->BID; + $relation->product = 0; $this->dao->replace(TABLE_RELATION)->data($relation)->exec(); } @@ -10128,6 +10131,7 @@ class upgradeModel extends model $relation->relation = 1; $relation->BType = 'bug'; $relation->BID = $relatedBugID; + $relation->product = 0; $this->dao->replace(TABLE_RELATION)->data($relation)->exec(); } } @@ -10139,6 +10143,7 @@ class upgradeModel extends model $relation->relation = 'generated'; $relation->BType = 'bug'; $relation->BID = $bugID; + $relation->product = 0; $this->dao->replace(TABLE_RELATION)->data($relation)->exec(); } if(!empty($bug->task)) @@ -10149,6 +10154,7 @@ class upgradeModel extends model $relation->relation = 'generated'; $relation->BType = 'bug'; $relation->BID = $bugID; + $relation->product = 0; $this->dao->replace(TABLE_RELATION)->data($relation)->exec(); } if(!empty($bug->case)) @@ -10159,6 +10165,7 @@ class upgradeModel extends model $relation->relation = 'generated'; $relation->BType = 'bug'; $relation->BID = $bugID; + $relation->product = 0; $this->dao->replace(TABLE_RELATION)->data($relation)->exec(); } } @@ -10176,6 +10183,7 @@ class upgradeModel extends model $relation->relation = 1; $relation->BType = 'testcase'; $relation->BID = $relatedCaseID; + $relation->product = 0; $this->dao->replace(TABLE_RELATION)->data($relation)->exec(); } if(!empty($case->story)) @@ -10186,6 +10194,7 @@ class upgradeModel extends model $relation->relation = 'generated'; $relation->BType = 'testcase'; $relation->BID = $caseID; + $relation->product = 0; $this->dao->replace(TABLE_RELATION)->data($relation)->exec(); } if(!empty($case->fromBug)) @@ -10196,6 +10205,7 @@ class upgradeModel extends model $relation->relation = 'generated'; $relation->BType = 'testcase'; $relation->BID = $caseID; + $relation->product = 0; $this->dao->replace(TABLE_RELATION)->data($relation)->exec(); } } @@ -10205,8 +10215,9 @@ class upgradeModel extends model foreach($taskList as $taskID => $task) { $relation = new stdClass(); - $relation->BType = 'task'; - $relation->BID = $taskID; + $relation->BType = 'task'; + $relation->BID = $taskID; + $relation->product = 0; if(!empty($task->fromBug)) { $relation->relation = 'transferredto'; @@ -10240,6 +10251,7 @@ class upgradeModel extends model $relation->relation = 'transferredto'; $relation->BType = 'story'; $relation->BID = $storyID; + $relation->product = 0; $this->dao->replace(TABLE_RELATION)->data($relation)->exec(); } @@ -10256,6 +10268,7 @@ class upgradeModel extends model $relation->relation = 'interrated'; $relation->BType = 'release'; $relation->BID = $releaseID; + $relation->product = 0; $this->dao->replace(TABLE_RELATION)->data($relation)->exec(); } } @@ -10273,6 +10286,7 @@ class upgradeModel extends model $relation->relation = 'interrated'; $relation->BType = 'build'; $relation->BID = $buildID; + $relation->product = 0; $this->dao->replace(TABLE_RELATION)->data($relation)->exec(); } } @@ -10288,6 +10302,7 @@ class upgradeModel extends model $relation->relation = 'generated'; $relation->BType = 'design'; $relation->BID = $designID; + $relation->product = 0; $this->dao->replace(TABLE_RELATION)->data($relation)->exec(); } @@ -10301,6 +10316,7 @@ class upgradeModel extends model $relation->relation = 'transferredto'; $relation->BType = $story->type; $relation->BID = $story->id; + $relation->product = 0; $this->dao->replace(TABLE_RELATION)->data($relation)->exec(); } @@ -10316,6 +10332,7 @@ class upgradeModel extends model $relation->relation = 'transferredto'; $relation->BType = $feedbackTransferredToType; $relation->BID = $id; + $relation->product = 0; $this->dao->replace(TABLE_RELATION)->data($relation)->exec(); } } @@ -10330,6 +10347,7 @@ class upgradeModel extends model $relation->relation = 'transferredto'; $relation->BType = $transferredObject->objectType; $relation->BID = $transferredObject->objectId; + $relation->product = 0; $this->dao->replace(TABLE_RELATION)->data($relation)->exec(); } @@ -10346,6 +10364,7 @@ class upgradeModel extends model $relation->relation = 'twin'; $relation->BType = 'story'; $relation->BID = $twinID; + $relation->product = 0; $this->dao->replace(TABLE_RELATION)->data($relation)->exec(); } } @@ -10361,6 +10380,7 @@ class upgradeModel extends model $relation->relation = 'subdivideinto'; $relation->BType = $childStory->type; $relation->BID = $childStory->id; + $relation->product = 0; if(!empty($childStory->parent)) { $relation->AType = $parentStoryType[$childStory->parent]; @@ -10385,6 +10405,7 @@ class upgradeModel extends model $relation->relation = 1; $relation->BType = 'risk'; $relation->BID = $riskIssueList->risk; + $relation->product = 0; $this->dao->replace(TABLE_RELATION)->data($relation)->exec(); } @@ -10398,6 +10419,7 @@ class upgradeModel extends model $relation->relation = 'subdivideinto'; $relation->BType = 'demand'; $relation->BID = $childDemandID; + $relation->product = 0; $this->dao->replace(TABLE_RELATION)->data($relation)->exec(); }