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

* Optimize create label func and call it.

Browse Source
This commit is contained in:
dingguodong
2021-06-25 14:05:33 +08:00
parent 9ef6f630ec
commit 6a64f459bc
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/model.php
+12 -11
View File
@@ -338,30 +338,29 @@ class gitlabModel extends model
*
* @param int $gitlabID
* @param int $projectID
* @param object $object
* @param string $object
* @param string $objectID
* @access public
* @return object|false
* @return object
*/
public function createZentaoObjectLabel($gitlabID, $projectID, $object)
public function createZentaoObjectLabel($gitlabID, $projectID, $object, $objectID)
{
if(empty($object->type) or empty($object->objectID)) return false;
$label = new stdclass;
if($object->type == 'task')
if($object == 'task')
{
$label->name = sprintf($this->config->gitlab->zentaoObjectLabel->name, $object->type, $object->objectID);
$label->name = sprintf($this->config->gitlab->zentaoObjectLabel->name, $object, $objectID);
$label->color = $config->gitlab->zentaoObjectLabel->taskColor;
$label->description = $this->createLink('task', 'view', "taskID={$object->taskID}");
}
elseif($object->type == 'bug')
elseif($object == 'bug')
{
$label->name = sprintf($this->config->gitlab->zentaoObjectLabel->name, $object->type, $object->objectID);
$label->name = sprintf($this->config->gitlab->zentaoObjectLabel->name, $object, $objectID);
$label->color = $config->gitlab->zentaoObjectLabel->taskColor;
$label->description = $this->createLink('bug', 'view', "taskID={$object->bugID}");
}
elseif($object->type == 'story')
elseif($object == 'story')
{
$label->name = sprintf($this->config->gitlab->zentaoObjectLabel->name, $object->type, $object->objectID);
$label->name = sprintf($this->config->gitlab->zentaoObjectLabel->name, $object, $objectID);
$label->color = $config->gitlab->zentaoObjectLabel->taskColor;
$label->description = $this->createLink('story', 'view', "storyID={$object->storyID}");
}
@@ -554,6 +553,7 @@ class gitlabModel extends model
$issue = $this->apiCreateIssue($gitlab, $gitlabProject, $issue);
$this->saveSyncedIssue('task', $task, $gitlab, $issue);
$this->createZentaoObjectLabel($gitlab, $gitlabProject, 'task', $taskID);
}
/**
@@ -573,6 +573,7 @@ class gitlabModel extends model
if($syncedIssue) $issue = $this->apiUpdateIssue($gitlab, $gitlabProject, $syncedIssue, $issue);
$issue = $this->apiCreateIssue($gitlab, $gitlabProject, $issue);
if($issue) $this->saveSyncedIssue('story', $story, $gitlab, $issue);
$this->createZentaoObjectLabel($gitlab, $gitlabProject, 'story', $storyID);
}
/**