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

* Optimize codes and bug fix.

Browse Source
This commit is contained in:
dingguodong
2021-06-29 09:40:45 +08:00
parent 3906982fdb
commit 38ca3cbb9e
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/model.php
+22 -13
View File
@@ -565,13 +565,17 @@ class gitlabModel extends model
$issue = $this->taskToIssue($gitlab, $gitlabProject, $task);
$this->createZentaoObjectLabel($gitlab, $gitlabProject, 'task', $taskID);
$issue->labels = sprintf($this->config->gitlab->zentaoObjectLabel->name, 'task', $taskID);
if($syncedIssue) $issue = $this->apiUpdateIssue($gitlab, $gitlabProject, $syncedIssue, $issue);
$issue = $this->apiCreateIssue($gitlab, $gitlabProject, $issue);
$this->saveSyncedIssue('task', $task, $gitlab, $issue);
if($syncedIssue)
{
$issue = $this->apiUpdateIssue($gitlab, $gitlabProject, $syncedIssue, $issue);
}
else
{
$this->createZentaoObjectLabel($gitlab, $gitlabProject, 'task', $taskID);
$issue->labels = sprintf($this->config->gitlab->zentaoObjectLabel->name, 'task', $taskID);
$issue = $this->apiCreateIssue($gitlab, $gitlabProject, $issue);
$this->saveSyncedIssue('task', $task, $gitlab, $issue);
}
}
/**
@@ -627,12 +631,17 @@ class gitlabModel extends model
$syncedIssue = $this->getSyncedIssue($objectType = 'bug', $objectID = $bugID, $gitlab);
$issue = $this->bugToIssue($gitlab, $gitlabProject, $bug);
$this->createZentaoObjectLabel($gitlab, $gitlabProject, 'bug', $bugID);
$issue->labels = sprintf($this->config->gitlab->zentaoObjectLabel->name, 'bug', $bugID);
if($syncedIssue) $issue = $this->apiUpdateIssue($gitlab, $gitlabProject, $syncedIssue, $issue);
$issue = $this->apiCreateIssue($gitlab, $gitlabProject, $issue);
if($issue) $this->saveSyncedIssue('bug', $bug, $gitlab, $issue);
if($syncedIssue)
{
$issue = $this->apiUpdateIssue($gitlab, $gitlabProject, $syncedIssue, $issue);
}
else
{
$this->createZentaoObjectLabel($gitlab, $gitlabProject, 'bug', $bugID);
$issue->labels = sprintf($this->config->gitlab->zentaoObjectLabel->name, 'bug', $bugID);
$issue = $this->apiCreateIssue($gitlab, $gitlabProject, $issue);
if($issue) $this->saveSyncedIssue('bug', $bug, $gitlab, $issue);
}
}
/**