Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu

Browse Source
This commit is contained in:
Guan Xiying
2021-06-29 10:58:39 +08:00
parent e3a5814eec 7a1a1e44f5
commit 1325d772fe
5 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/model.php
+15
View File
@@ -561,6 +561,14 @@ class gitlabModel extends model
public function pushTask($taskID, $gitlab, $gitlabProject)
{
$task = $this->loadModel('task')->getByID($taskID);
if(!$gitlabID or !$projectID)
{
$result = $this->getGitlabIDprojectID('task', $taskID);
$gitlabID = $result->gitlabID;
$projectID = $result->projectID;
}
$syncedIssue = $this->getSyncedIssue($objectType = 'task', $objectID = $taskID, $gitlab);
$issue = $this->taskToIssue($gitlab, $gitlabProject, $task);
@@ -628,6 +636,13 @@ class gitlabModel extends model
{
$bug = $this->loadModel('bug')->getByID($bugID);
if(!$gitlabID or !$projectID)
{
$result = $this->getGitlabIDprojectID('bug', $bugID);
$gitlabID = $result->gitlabID;
$projectID = $result->projectID;
}
$syncedIssue = $this->getSyncedIssue($objectType = 'bug', $objectID = $bugID, $gitlab);
$issue = $this->bugToIssue($gitlab, $gitlabProject, $bug);