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

* Bug fix and format codes.

Browse Source
This commit is contained in:
dingguodong
2021-06-28 23:17:50 +08:00
parent bb3bce97db
commit c064d05ab6
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/bug/model.php
View File

@@ -90,7 +90,7 @@ class bugModel extends model
$bugID = $this->dao->lastInsertID();
/* Sync this bug to gitlab issue. */
$this->loadModel('gitlab')->pushToissue('bug', $bugID, $this->post->gitlab, $this->post->gitlabProject);
$this->loadModel('gitlab')->pushToIssue('bug', $bugID, $this->post->gitlab, $this->post->gitlabProject);
$this->file->updateObjectID($this->post->uid, $bugID, 'bug');
$this->file->saveUpload('bug', $bugID);

20
module/gitlab/model.php
View File

@@ -578,14 +578,16 @@ class gitlabModel extends model
* Push story to gitlab issue.
*
* @param int $storyID
* @param int $gitlab
* @param int $gitlabProject
* @param int $gitlabID
* @param int $projectID
* @access public
* @return void
*/
public function pushStory($storyID, $gitlabID, $projectID)
{
$story = $this->loadModel('story')->getByID($storyID);
if(empty($bug)) return false;
if(!$gitlabID or !$projectID)
{
$result = $this->getGitlabIDprojectID('story', $storyID);
@@ -612,7 +614,7 @@ class gitlabModel extends model
/**
* Sync bug to gitlab issue.
*
* @param int $storyID
* @param int $bugID
* @param int $gitlab
* @param int $gitlabProject
* @access public
@@ -643,7 +645,7 @@ class gitlabModel extends model
* @access public
* @return void
*/
public function pushToissue($objectType, $objectID, $gitlabID, $projectID)
public function pushToIssue($objectType, $objectID, $gitlabID, $projectID)
{
$object = $this->loadModel($objectType)->getByID($objectID);
if(!$gitlabID or !$projectID)
@@ -654,9 +656,9 @@ class gitlabModel extends model
}
$syncedIssue = $this->getSyncedIssue($objectType = $objectType, $objectID = $objectID, $gitlabID);
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);
if($objectType == 'story') $issue = $this->storyToIssue($gitlabID, $projectID, $object);
if($objectType == 'task') $issue = $this->taskToIssue($gitlabID, $projectID, $object);
if($objectType == 'bug') $issue = $this->bugToIssue($gitlabID, $projectID, $object);
if($syncedIssue)
{
@@ -667,7 +669,7 @@ class gitlabModel extends model
$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);
if($issue) $this->saveSyncedIssue($objectType, $object, $gitlabID, $issue);
}
}
@@ -755,7 +757,7 @@ class gitlabModel extends model
*
* @param int $gitlabID
* @param int $gitlabProjectID
* @param object $task
* @param object $task
* @access public
* @return object
*/