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

* Fix Replace with getRationByObject.

Browse Source
This commit is contained in:
lichengjun
2021-07-01 18:34:24 +08:00
parent 7c240783af
commit cebe56a593
4 changed files with 42 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/model.php
+12 -11
View File
@@ -647,7 +647,7 @@ class bugModel extends model
if(!empty($bug->resolvedBy)) $this->loadModel('score')->create('bug', 'resolve', $bugID);
$this->file->updateObjectID($this->post->uid, $bugID, 'bug');
$relation = $this->loadModel('gitlab')->getRelationByObject('bug',$bugID);
$relation = $this->loadModel('gitlab')->getRelationByObject('bug', $bugID);
if($relation) $this->loadModel('gitlab')->pushToIssue('bug', $bugID, $relation->gitlabID, $relation->projectID);
return common::createChanges($oldBug, $bug);
@@ -1183,7 +1183,7 @@ class bugModel extends model
$this->dao->update(TABLE_BUG)->data($bug)->autoCheck()->where('id')->eq((int)$bugID)->exec();
$this->dao->update(TABLE_BUG)->set('activatedCount = activatedCount + 1')->where('id')->eq((int)$bugID)->exec();
$relation = $this->loadModel('gitlab')->getGitlabIDprojectID('bug',$bugID);
$relation = $this->loadModel('gitlab')->getRelationByObject('bug',$bugID);
if($relation) $this->loadModel('gitlab')->pushToIssue('bug', $bugID, $relation->gitlabID, $relation->projectID);
$openedBuilds = $this->post->openedBuild;
@@ -1226,19 +1226,20 @@ class bugModel extends model
->remove('comment')
->get();
$relation = $this->loadModel('gitlab')->getRelationByObject('bug', $bugID);
$this->dao->update(TABLE_BUG)->data($bug)->autoCheck()->where('id')->eq((int)$bugID)->exec();
$singleIssue = new stdclass();
$singleIssue = $this->loadModel('gitlab')->apiGetSingleIssue($relation->gitlabID, $relation->issueID);
$relation = $this->loadModel('gitlab')->getRelationByObject('bug', $bugID);
if(!empty($relation))
{
$singleIssue = new stdclass();
$singleIssue = $this->loadModel('gitlab')->apiGetSingleIssue($relation->gitlabID, $relation->issueID);
if($singleIssue->state != 'closed')
{
$objectID = $this->loadModel('gitlab')->getGitlabIDprojectID('bug',$bugID);
if($objectID) $this->loadModel('gitlab')->pushToIssue('bug', $bugID, $objectID->gitlabID, $objectID->projectID);
if($singleIssue->state != 'closed')
{
$objectID = $this->loadModel('gitlab')->getRelationByObject('bug',$bugID);
if($objectID) $this->loadModel('gitlab')->pushToIssue('bug', $bugID, $objectID->gitlabID, $objectID->projectID);
}
}
return common::createChanges($oldBug, $bug);
}