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

* Bug fix and optimize for import issue.

Browse Source
This commit is contained in:
dingguodong
2021-07-09 13:48:23 +08:00
parent b062fe0a8e
commit ab2e2191e3
5 changed files with 32 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/model.php
+9 -10
View File
@@ -283,18 +283,16 @@ class bugModel extends model
*/
public function createBugFromGitlabIssue($bug, $executionID)
{
$bug->openedBy = $this->app->user->account;
$bug->openedBuild = 0;
$bug->story = 0;
$bug->task = 0;
$bug->project = $this->dao->select('parent')->from(TABLE_EXECUTION)->where('id')->eq($executionID)->fetch('parent');
$bug->openedBy = $this->app->user->account;
$bug->openedDate = helper::now(); // TODO(dingguodong) use from issue->created_at ?
$bug->assignedDate = isset($bug->assignedTo) ? helper::now() : 0;
$bug->openedBuild = 1;
$bug->story = 0;
$bug->task = 0;
$bug->project = $this->dao->select('parent')->from(TABLE_EXECUTION)->where('id')->eq($executionID)->fetch('parent');
$this->dao->insert(TABLE_BUG)->data($bug, $skip = 'gitlab,gitlabProject')->autoCheck()->batchCheck($this->config->bug->create->requiredFields, 'notempty')->exec();
if(!dao::isError())
{
$bugID = $this->dao->lastInsertID();
return $bugID;
}
if(!dao::isError()) return $this->dao->lastInsertID();
return false;
}
@@ -675,6 +673,7 @@ class bugModel extends model
if(!empty($bug))
{
$relation = $this->loadModel('gitlab')->getRelationByObject('bug', $bugID);
$bug->id = $bugID;
if($relation) $this->loadModel('gitlab')->apiUpdateIssue($relation->gitlabID, $relation->projectID, $relation->issueID, 'bug', $bug);
}
return common::createChanges($oldBug, $bug);