diff --git a/module/gitlab/model.php b/module/gitlab/model.php index 3e051e58ad..8d9d9b7b48 100644 --- a/module/gitlab/model.php +++ b/module/gitlab/model.php @@ -834,7 +834,7 @@ class gitlabModel extends model if($syncedIssue) return $this->apiUpdateIssue($gitlabID, $projectID, $syncedIssue->issueID, $issue); $label = $this->createZentaoObjectLabel($gitlabID, $projectID, $objectType, $objectID); - $issue->labels = isset($label->name) ? $label->name : ''; + $issue->labels = isset($label->name) ? '' :$label->name; $issue = $this->apiCreateIssue($gitlabID, $projectID, $issue); if($issue) $this->saveSyncedIssue($objectType, $object, $gitlabID, $issue); diff --git a/module/story/model.php b/module/story/model.php index 153d6473db..dc9b65c26f 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -441,7 +441,6 @@ class storyModel extends model dao::$errors['message'][] = sprintf($this->lang->error->notempty, $this->lang->story->$field); return false; } - $data[$i] = $story; } diff --git a/module/task/model.php b/module/task/model.php index ddf4aea17e..ae519d1816 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -380,6 +380,10 @@ class taskModel extends model if(dao::isError()) return false; $taskID = $this->dao->lastInsertID(); + + /* Sync this task to gitlab issue. */ + $this->loadModel('gitlab')->pushToIssue('task', $taskID, $this->post->gitlab, $this->post->gitlabProject); + $taskSpec = new stdClass(); $taskSpec->task = $taskID; $taskSpec->version = $task->version; @@ -1791,7 +1795,7 @@ class taskModel extends model } if($oldTask->story) $this->loadModel('story')->setStage($oldTask->story); - $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()) return common::createChanges($oldTask, $task);