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

* Bug fix and optimize for import issue.

Browse Source
This commit is contained in:
dingguodong
2021-07-09 13:48:23 +08:00
parent b062fe0a8e
commit ab2e2191e3
5 changed files with 32 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/control.php
+4 -14
View File
@@ -285,21 +285,11 @@ class gitlab extends control
$object = $this->gitlab->issueToZentaoObject($issue, $gitlabID);
$object->product = $productList[$issueID];
$object->execution = $executionID;
$clonedObject = clone $object;
if($objectType == 'task')
{
$objectID = $this->loadModel('task')->createTaskFromGitlabIssue($object, $executionID);
}
if($objectType == 'bug')
{
$objectID = $this->loadModel('bug')->createBugFromGitlabIssue($object, $executionID);
}
if($objectType == 'story')
{
$objectID = $this->loadModel('story')->createStoryFromGitlabIssue($object, $executionID);
}
if($objectType == 'task') $objectID = $this->loadModel('task')->createTaskFromGitlabIssue($clonedObject, $executionID);
if($objectType == 'bug') $objectID = $this->loadModel('bug')->createBugFromGitlabIssue($clonedObject, $executionID);
if($objectType == 'story') $objectID = $this->loadModel('story')->createStoryFromGitlabIssue($clonedObject, $executionID);
if($objectID)
{
module/gitlab/model.php
+2
View File
@@ -1159,6 +1159,8 @@ class gitlabModel extends model
if($optionType == 'userPairs' and isset($issue->$gitlabField)) $value = zget($gitlabUsers, $issue->$gitlabField);
if($optionType == 'configItems' and isset($issue->$gitlabField)) $value = array_search($issue->$gitlabField, $this->config->gitlab->$options);
if($value) $object->$zentaoField = $value;
if($gitlabField == "description") $object->$zentaoField .= "<br>" . $issue->web_url;
}
return $object;
}