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

* Add bug fix.

Browse Source
This commit is contained in:
lichengjun
2021-06-28 11:24:55 +08:00
parent 3429d54c09
commit 3907ff1ea7
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/model.php
+4 -5
View File
@@ -597,11 +597,11 @@ class gitlabModel extends model
$issue = $this->bugToIssue($gitlab, $gitlabProject, $bug);
$this->createZentaoObjectLabel($gitlab, $gitlabProject, 'bug', $bugID);
$issue->labels = sprintf($this->config->gitlab->zentaoObjectLabel->name, 'bug', $storyID);
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', $story, $gitlab, $issue);
if($issue) $this->saveSyncedIssue('bug', $bug, $gitlab, $issue);
}
/**
@@ -730,7 +730,7 @@ class gitlabModel extends model
$gitlabUsers = $this->getUserAccountIdPairs($gitlabID);
if(empty($gitlabUsers)) return false;
foreach($map as $storyField => $config)
foreach($map as $bugField => $config)
{
$value = '';
list($field, $optionType, $options) = explode('|', $config);
@@ -738,7 +738,7 @@ class gitlabModel extends model
if($optionType == 'fields') $value = $bug->$bugField . "\n\n" . $story->$options;
if($optionType == 'userPairs')
{
$value = zget($gitlabUsers, $story->$bugField);
$value = zget($gitlabUsers, $bug->$bugField);
}
if($optionType == 'configItems')
{
@@ -747,7 +747,6 @@ class gitlabModel extends model
if($value) $issue->$field = $value;
}
var_dump($issue);die;
return $issue;
}