diff --git a/module/gitlab/model.php b/module/gitlab/model.php index 1fbbaa4647..af1f28317d 100644 --- a/module/gitlab/model.php +++ b/module/gitlab/model.php @@ -682,7 +682,6 @@ class gitlabModel extends model if($objectType == 'story') $issue = $this->storyToIssue($gitlabID, $projectID, $object); if($objectType == 'task') $issue = $this->taskToIssue($gitlabID, $projectID, $object); if($objectType == 'bug') $issue = $this->bugToIssue($gitlabID, $projectID, $object); - if($syncedIssue) { $this->apiUpdateIssue($gitlabID, $projectID, $syncedIssue->BID, $issue); diff --git a/module/story/model.php b/module/story/model.php index 1656103c23..24e9c9b44b 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -830,8 +830,8 @@ class storyModel extends model $this->dao->insert(TABLE_STORYREVIEW)->data($reviewData)->exec(); } /* update story to gitlab issue. */ - $objectID = $this->loadModel('gitlab')->getGitlabIDprojectID('story',$storyID); - if($objectID) $this->loadModel('gitlab')->pushToissue('story', $storyID, $objectID->gitlabID, $objectID->projectID); + $objectID = $this->loadModel('gitlab')->getGitlabidProjectID('story',$storyID); + if($objectID) $this->loadModel('gitlab')->pushToIssue('story', $storyID, $objectID->gitlabID, $objectID->projectID); unset($oldStory->parent); unset($story->parent); diff --git a/module/task/model.php b/module/task/model.php index 300d3e3c68..029a9e17b4 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -122,7 +122,7 @@ class taskModel extends model $taskID = $this->dao->lastInsertID(); /* Sync this task to gitlab issue. */ - $this->loadModel('gitlab')->pushTask($taskID, $this->post->gitlab, $this->post->gitlabProject); + $this->loadModel('gitlab')->pushToIssue('task', $taskID, $this->post->gitlab, $this->post->gitlabProject); /* Mark design version.*/ if(isset($task->design) && !empty($task->design)) @@ -941,6 +941,10 @@ class taskModel extends model ->batchCheckIF($task->closedReason == 'cancel', 'finishedBy, finishedDate', 'empty') ->where('id')->eq((int)$taskID)->exec(); + /* update story to gitlab issue. */ + $objectID = $this->loadModel('gitlab')->getGitlabidProjectID('task',$taskID); + if($objectID) $this->loadModel('gitlab')->pushToIssue('task', $taskID, $objectID->gitlabID, $objectID->projectID); + if(!dao::isError()) { /* Mark design version.*/