diff --git a/module/bug/model.php b/module/bug/model.php index fe879e49e8..aef3b6b84a 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -1219,6 +1219,9 @@ class bugModel extends model $this->dao->update(TABLE_BUG)->data($bug)->autoCheck()->where('id')->eq((int)$bugID)->exec(); + $objectID = $this->loadModel('gitlab')->getGitlabIDprojectID('bug',$bugID); + if($objectID) $this->loadModel('bug')->pushToissue('bug', $bugID, $objectID->gitlabID, $objectID->projectID); + return common::createChanges($oldBug, $bug); } diff --git a/module/story/model.php b/module/story/model.php index 05486f3c2c..1656103c23 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -831,7 +831,7 @@ class storyModel extends model } /* update story to gitlab issue. */ $objectID = $this->loadModel('gitlab')->getGitlabIDprojectID('story',$storyID); - if($objectID) $this->loadModel('gitlab')->pushToissue('story', $storyID, $this->post->gitlab, $this->post->gitlabProject); + if($objectID) $this->loadModel('gitlab')->pushToissue('story', $storyID, $objectID->gitlabID, $objectID->projectID); unset($oldStory->parent); unset($story->parent); @@ -1426,6 +1426,9 @@ class storyModel extends model ->checkIF($story->closedReason == 'duplicate', 'duplicateStory', 'notempty') ->where('id')->eq($storyID)->exec(); + $objectID = $this->loadModel('gitlab')->getGitlabIDprojectID('story',$storyID); + if($objectID) $this->loadModel('gitlab')->pushToissue('story', $storyID, $objectID->gitlabID, $objectID->projectID); + /* Update parent story status. */ if($oldStory->parent > 0) $this->updateParentStatus($storyID, $oldStory->parent); $this->setStage($storyID); @@ -1769,9 +1772,9 @@ class storyModel extends model if(!dao::isError()) { - /* Update this story to gitlab issue. */ + /* Update story to gitlab issue. */ $objectID = $this->loadModel('gitlab')->getGitlabIDprojectID('story',$storyID); - if($objectID) $this->loadModel('gitlab')->pushToissue('story', $storyID, $this->post->gitlab, $this->post->gitlabProject); + if($objectID) $this->loadModel('gitlab')->pushToissue('story', $storyID, $objectID->gitlabID, $objectID->projectID); return common::createChanges($oldStory, $story); } diff --git a/module/task/model.php b/module/task/model.php index 246a17f9c0..153047c1e0 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1670,6 +1670,9 @@ class taskModel extends model ->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); + if($oldTask->parent > 0) $this->updateParentStatus($taskID); if($oldTask->story) $this->loadModel('story')->setStage($oldTask->story); if($task->status == 'done' && !dao::isError()) $this->loadModel('score')->create('task', 'finish', $taskID); @@ -1726,6 +1729,9 @@ 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); + if(!dao::isError()) { if($oldTask->parent > 0) $this->updateParentStatus($taskID); @@ -1769,6 +1775,10 @@ class taskModel extends model $this->dao->update(TABLE_TASK)->set('assignedTo=openedBy')->where('parent')->eq((int)$taskID)->exec(); } if($oldTask->story) $this->loadModel('story')->setStage($oldTask->story); + + $objectID = $this->loadModel('gitlab')->getGitlabIDprojectID('task',$taskID); + if($objectID) $this->loadModel('gitlab')->pushToissue('task', $taskID, $objectID->gitlabID, $objectID->projectID); + if(!dao::isError()) return common::createChanges($oldTask, $task); }