diff --git a/module/bug/model.php b/module/bug/model.php index a52f200b1e..ad75ee394e 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -90,7 +90,7 @@ class bugModel extends model $bugID = $this->dao->lastInsertID(); /* Sync this bug to gitlab issue. */ - $this->loadModel('gitlab')->pushToissue('bug', $bugID, $this->post->gitlab, $this->post->gitlabProject); + $this->loadModel('gitlab')->pushToIssue('bug', $bugID, $this->post->gitlab, $this->post->gitlabProject); $this->file->updateObjectID($this->post->uid, $bugID, 'bug'); $this->file->saveUpload('bug', $bugID); diff --git a/module/gitlab/model.php b/module/gitlab/model.php index f100bd43cb..568d05c41f 100644 --- a/module/gitlab/model.php +++ b/module/gitlab/model.php @@ -578,14 +578,16 @@ class gitlabModel extends model * Push story to gitlab issue. * * @param int $storyID - * @param int $gitlab - * @param int $gitlabProject + * @param int $gitlabID + * @param int $projectID * @access public * @return void */ public function pushStory($storyID, $gitlabID, $projectID) { $story = $this->loadModel('story')->getByID($storyID); + if(empty($bug)) return false; + if(!$gitlabID or !$projectID) { $result = $this->getGitlabIDprojectID('story', $storyID); @@ -612,7 +614,7 @@ class gitlabModel extends model /** * Sync bug to gitlab issue. * - * @param int $storyID + * @param int $bugID * @param int $gitlab * @param int $gitlabProject * @access public @@ -643,7 +645,7 @@ class gitlabModel extends model * @access public * @return void */ - public function pushToissue($objectType, $objectID, $gitlabID, $projectID) + public function pushToIssue($objectType, $objectID, $gitlabID, $projectID) { $object = $this->loadModel($objectType)->getByID($objectID); if(!$gitlabID or !$projectID) @@ -654,9 +656,9 @@ class gitlabModel extends model } $syncedIssue = $this->getSyncedIssue($objectType = $objectType, $objectID = $objectID, $gitlabID); - if($objectType == 'story') $issue = $this->storyToIssue($gitlabID, $projectID, $objectID); - if($objectType == 'task') $issue = $this->taskToIssue($gitlabID, $projectID, $objectID); - if($objectType == 'bug') $issue = $this->bugToIssue($gitlabID, $projectID, $objectID); + 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) { @@ -667,7 +669,7 @@ class gitlabModel extends model $this->createZentaoObjectLabel($gitlabID, $projectID, $objectType, $objectID); $issue->labels = sprintf($this->config->gitlab->zentaoObjectLabel->name, $objectType, $objectID); $issue = $this->apiCreateIssue($gitlabID, $projectID, $issue); - if($issue) $this->saveSyncedIssue($objectType, $objectID, $gitlabID, $issue); + if($issue) $this->saveSyncedIssue($objectType, $object, $gitlabID, $issue); } } @@ -755,7 +757,7 @@ class gitlabModel extends model * * @param int $gitlabID * @param int $gitlabProjectID - * @param object $task + * @param object $task * @access public * @return object */