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

* Optimize this function.

Browse Source
This commit is contained in:
dingguodong
2021-06-28 16:54:29 +08:00
parent 48912189f4
commit 6a358a0cf8
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/model.php
+23 -10
View File
@@ -639,23 +639,36 @@ class gitlabModel extends model
* @param string $objectType
* @param int $objectID
* @param int $gitlab
* @param int $gitlabProject
* @param int $projectID
* @access public
* @return void
*/
public function pushToissue($objectType, $objectID, $gitlabID, $gitlabProject)
public function pushToissue($objectType, $objectID, $gitlabID, $projectID)
{
$data = $this->loadModel($objectType)->getByID($objectID);
$object = $this->loadModel($objectType)->getByID($objectID);
if(!$gitlabID or !$projectID)
{
$result = $this->getGitlabIDprojectID($objectType, $objectID);
$gitlabID = $result->gitlabID;
$projectID = $result->projectID;
}
$syncedIssue = $this->getSyncedIssue($objectType = $objectType, $objectID = $objectID, $gitlabID);
$issue = $this->bugToIssue($gitlabID, $gitlabProject, $data);
if($objectType == 'story') $issue = $this->storyToIssue($gitlabID, $projectID, $objectID);
if($objectType == 'task') $issue = $this->taskToIssue($gitlabID, $projectID, $objectID);
if($objectType == 'bug') $issue = $this->bugToIssue($gitlabID, $projectID, $objectID);
$this->createZentaoObjectLabel($gitlabID, $gitlabProject, $objectType, $objectID);
$issue->labels = sprintf($this->config->gitlab->zentaoObjectLabel->name, $objectType, $objectID);
if($syncedIssue) $issue = $this->apiUpdateIssue($gitlabID, $gitlabProject, $syncedIssue, $issue);
$issue = $this->apiCreateIssue($gitlabID, $gitlabProject, $issue);
if($issue) $this->saveSyncedIssue($objectType, $data, $gitlabID, $issue);
if($syncedIssue)
{
$this->apiUpdateIssue($gitlabID, $projectID, $syncedIssue, $issue);
}
else
{
$this->createZentaoObjectLabel($gitlabID, $projectID, $objectType, $objectID);
$issue->labels = sprintf($this->config->gitlab->zentaoObjectLabel->name, $objectType, $objectID);
$issue = $this->apiCreateIssue($gitlabID, $projectID, $issue);
if($issue) $this->saveSyncedIssue($objectType, $objectID, $gitlabID, $issue);
}
}
/**