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/task/model.php
+14 -3
View File
@@ -942,7 +942,7 @@ class taskModel extends model
->where('id')->eq((int)$taskID)->exec();
/* update story to gitlab issue. */
$objectID = $this->loadModel('gitlab')->getGitlabidProjectID('task',$taskID);
$objectID = $this->loadModel('gitlab')->getRelationByObject('task',$taskID);
if($objectID) $this->loadModel('gitlab')->pushToIssue('task', $taskID, $objectID->gitlabID, $objectID->projectID);
if(!dao::isError())
@@ -1733,8 +1733,19 @@ class taskModel extends model
$this->dao->update(TABLE_TASK)->data($task)->autoCheck()->where('id')->eq((int)$taskID)->exec();
$objectID = $this->loadModel('gitlab')->getGitlabIDprojectID('task',$taskID);
if($objectID) $this->loadModel('gitlab')->pushToissue('task', $taskID, $objectID->gitlabID, $objectID->projectID);
$relation = $this->loadModel('gitlab')->getRelationByObject('task', $taskID);
if(!empty($relation))
{
$singleIssue = new stdclass();
$singleIssue = $this->loadModel('gitlab')->apiGetSingleIssue($relation->gitlabID, $relation->issueID);
if($singleIssue->state != 'closed')
{
$objectID = $this->loadModel('gitlab')->getRelationByObject('task',$taskID);
if($objectID) $this->loadModel('gitlab')->pushToIssue('task', $taskID, $objectID->gitlabID, $objectID->projectID);
}
}
if(!dao::isError())
{