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

* Fix code format.

Browse Source
This commit is contained in:
lichengjun
2021-07-08 09:29:29 +08:00
parent 8b36d4f2fc
commit de848b9faf
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/model.php
+2 -2
View File
@@ -543,7 +543,7 @@ class gitlabModel extends model
public function apiGetSingleIssue($gitlabID, $projectID, $issueID)
{
$url = sprintf($this->getApiRoot($gitlabID), "/projects/$projectID/issues/{$issueID}");
$aaa = json_decode(commonModel::http($url));
return json_decode(commonModel::http($url));
}
/**
@@ -583,7 +583,7 @@ class gitlabModel extends model
public function apiCreateIssue($gitlabID, $projectID, $objectType, $objectID, $object)
{
$label = $this->createZentaoObjectLabel($gitlabID, $projectID, $objectType, $objectID);
if(!isset($object->id)) $object->id = $objectID;
$issue = $this->loadModel('gitlab')->parseObjectToIssue($gitlabID, $projectID, $objectType, $object);
if(isset($label->name)) $issue->labels = $label->name;
foreach($this->config->gitlab->skippedFields->issueCreate[$objectType] as $field)
module/task/control.php
+1 -2
View File
@@ -649,8 +649,7 @@ class task extends control
if(isset($muletipleTasks[$taskID]) and !isset($muletipleTasks[$taskID][$this->post->assignedTo])) continue;
$relation = $this->loadModel('gitlab')->getRelationByObject('task', $taskID);
$this->loadModel('gitlab')->apiUpdateIssue($relation->gitlabID, $relation->projectID, $relation->issueID, 'task', $task);
if(!empty($task))$this->loadModel('gitlab')->apiUpdateIssue($relation->gitlabID, $relation->projectID, $relation->issueID, 'task', $task);
$changes = $this->task->assign($taskID);
if(dao::isError()) die(js::error(dao::getError()));
$actionID = $this->action->create('task', $taskID, 'Assigned', $this->post->comment, $this->post->assignedTo);