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

* Display gitlab pipeline log and add refresh button.

Browse Source
This commit is contained in:
dingguodong
2021-07-27 17:26:45 +08:00
parent e59a6f7b35
commit 22e7de0524
7 changed files with 42 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/model.php
+6 -6
View File
@@ -619,7 +619,7 @@ class gitlabModel extends model
{
if(!isset($object->id)) $object->id = $objectID;
$issue = $this->loadModel('gitlab')->parseObjectToIssue($gitlabID, $projectID, $objectType, $object);
$issue = $this->parseObjectToIssue($gitlabID, $projectID, $objectType, $object);
$label = $this->createZentaoObjectLabel($gitlabID, $projectID, $objectType, $objectID);
if(isset($label->name)) $issue->labels = $label->name;
@@ -695,7 +695,7 @@ class gitlabModel extends model
*/
public function apiCreatePipeline($gitlabID, $projectID, $reference)
{
$url = sprintf($this->loadModel('gitlab')->getApiRoot($gitlabID), "/projects/{$projectID}/pipeline");
$url = sprintf($this->getApiRoot($gitlabID), "/projects/{$projectID}/pipeline");
return json_decode(commonModel::http($url, $reference));
}
@@ -711,7 +711,7 @@ class gitlabModel extends model
*/
public function apiGetSinglePipeline($gitlabID, $projectID, $pipelineID)
{
$url = sprintf($this->loadModel('gitlab')->getApiRoot($gitlabID), "/projects/{$projectID}/pipelines/{$pipelineID}");
$url = sprintf($this->getApiRoot($gitlabID), "/projects/{$projectID}/pipelines/{$pipelineID}");
return json_decode(commonModel::http($url));
}
@@ -726,7 +726,7 @@ class gitlabModel extends model
*/
public function apiGetJobs($gitlabID, $projectID, $pipelineID)
{
$url = sprintf($this->loadModel('gitlab')->getApiRoot($gitlabID), "/projects/{$projectID}/pipelines/{$pipelineID}/jobs");
$url = sprintf($this->getApiRoot($gitlabID), "/projects/{$projectID}/pipelines/{$pipelineID}/jobs");
return json_decode(commonModel::http($url));
}
@@ -741,7 +741,7 @@ class gitlabModel extends model
*/
public function apiGetSingleJob($gitlabID, $projectID, $jobID)
{
$url = sprintf($this->loadModel('gitlab')->getApiRoot($gitlabID), "/projects/{$projectID}/jobs/{$jobID}");
$url = sprintf($this->getApiRoot($gitlabID), "/projects/{$projectID}/jobs/{$jobID}");
return json_decode(commonModel::http($url));
}
@@ -756,7 +756,7 @@ class gitlabModel extends model
*/
public function apiGetJobLog($gitlabID, $projectID, $jobID)
{
$url = sprintf($this->loadModel('gitlab')->getApiRoot($gitlabID), "/projects/{$projectID}/jobs/{$jobID}/trace");
$url = sprintf($this->getApiRoot($gitlabID), "/projects/{$projectID}/jobs/{$jobID}/trace");
return json_decode(commonModel::http($url));
}