diff --git a/module/bug/model.php b/module/bug/model.php index d51e28ce18..b12997f76f 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -289,6 +289,8 @@ class bugModel extends model $bug->openedBuild = 1; $bug->story = 0; $bug->task = 0; + $bug->pri = 3; + $bug->severity = 3; $bug->project = $this->dao->select('parent')->from(TABLE_EXECUTION)->where('id')->eq($executionID)->fetch('parent'); $this->dao->insert(TABLE_BUG)->data($bug, $skip = 'gitlab,gitlabProject')->autoCheck()->batchCheck($this->config->bug->create->requiredFields, 'notempty')->exec(); @@ -794,6 +796,11 @@ class bugModel extends model $this->executeHooks($bugID); $allChanges[$bugID] = common::createChanges($oldBug, $bug); + + /* update bug to gitlab issue. */ + $relation = $this->loadModel('gitlab')->getRelationByObject('bug', $bugID); + $bug->id = $bugID; + if($relation) $this->loadModel('gitlab')->apiUpdateIssue($relation->gitlabID, $relation->projectID, $relation->issueID, 'bug', $bug); } else { diff --git a/module/story/model.php b/module/story/model.php index e987324b9b..a7a37c404a 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -694,6 +694,11 @@ class storyModel extends model } $this->file->updateObjectID($this->post->uid, $storyID, 'story'); + + /* update story to gitlab issue. */ + $relation = $this->loadModel('gitlab')->getRelationByObject('story', $storyID); + if($relation) $this->loadModel('gitlab')->apiUpdateIssue($relation->gitlabID, $relation->projectID, $relation->issueID, 'story', $story); + return common::createChanges($oldStory, $story); } } diff --git a/module/task/model.php b/module/task/model.php index 6fe25f81fa..5d1eb2917f 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -978,7 +978,7 @@ class taskModel extends model ->batchCheckIF($task->closedReason == 'cancel', 'finishedBy, finishedDate', 'empty') ->where('id')->eq((int)$taskID)->exec(); - /* update story to gitlab issue. */ + /* update task to gitlab issue. */ $relation = $this->loadModel('gitlab')->getRelationByObject('task', $taskID); if(!empty($relation)) $this->loadModel('gitlab')->apiUpdateIssue($relation->gitlabID, $relation->projectID, $relation->issueID, 'task', $task); @@ -1281,6 +1281,10 @@ class taskModel extends model if($task->status == 'done') $this->loadModel('score')->create('task', 'finish', $taskID); if($task->status == 'closed') $this->loadModel('score')->create('task', 'close', $taskID); $allChanges[$taskID] = common::createChanges($oldTask, $task); + + /* update task to gitlab issue. */ + $relation = $this->loadModel('gitlab')->getRelationByObject('task', $taskID); + if(!empty($relation)) $this->loadModel('gitlab')->apiUpdateIssue($relation->gitlabID, $relation->projectID, $relation->issueID, 'task', $task); } else {