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

* Put name used frequently into config.

Browse Source
This commit is contained in:
dingguodong
2021-06-16 20:04:47 +08:00
parent eb59efcbca
commit 9c3c8022c9
2 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/model.php
+18 -13
View File
@@ -357,8 +357,8 @@ class gitlabModel extends model
$labels = $this->apiGetLabels($gitlabID, $projectID);
foreach($labels as $label)
{
if(strpos($label->name, "zentao task") == 0) return true;
if(strpos($label->name, "zentao bug") == 0) return true;
if(strpos($label->name, $this->config->gitlab->taskLabel->name) == 0) return true;
if(strpos($label->name, $this->config->gitlab->bugLabel->name) == 0) return true;
}
return false;
@@ -379,16 +379,16 @@ class gitlabModel extends model
if($this->isLabelExists($gitlabID, $projectID)) return true;
$taskLabel = new stdclass();
$taskLabel->name = "zentao task";
$taskLabel->description = "task label from zentao";
$taskLabel->color = "#0033CC";
$taskLabel->priority = "0";
$taskLabel->name = $this->config->gitlab->taskLabel->name;
$taskLabel->description = $this->config->gitlab->taskLabel->description;
$taskLabel->color = $this->config->gitlab->taskLabel->color;
$taskLabel->priority = $this->config->gitlab->taskLabel->priority;
$bugLabel = new stdclass();
$bugLabel->name = "zentao bug";
$bugLabel->description = "bug label from zentao";
$bugLabel->color = "#D10069";
$bugLabel->priority = "0";
$bugLabel->name = $this->config->gitlab->bugLabel->name;
$bugLabel->description = $this->config->gitlab->bugLabel->description;
$bugLabel->color = $this->config->gitlab->bugLabel->color;
$bugLabel->priority = $this->config->gitlab->bugLabel->priority;
$this->apiCreateLabel($gitlabID, $projectID, $taskLabel);
$this->apiCreateLabel($gitlabID, $projectID, $bugLabel);
@@ -396,15 +396,20 @@ class gitlabModel extends model
return;
}
public function apiCreateIssue($gitlabID, $projectID)
public function apiCreateIssue($gitlabID, $projectID, $issue)
{
$apiRoot = $this->getApiRoot($gitlabID);
$apiPath = "/projects/{$projectID}/issues/";
$url = sprintf($apiRoot, $apiPath);
$response = commonModel::http($url, $issue);
$labels = json_decode($response);
return $labels;
}
public function pushTask($task, $gitlabID,$projectID)
{
}
public function pushBug($bug, $gitlabID,$projectID)