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

Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu

Browse Source
This commit is contained in:
lichengjun
2021-06-28 14:05:05 +08:00
parent be619512c4 6f424a1466
commit cd060c0fef
4 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
module/gitlab/model.php
View File

@@ -878,6 +878,9 @@ class gitlabModel extends model
$issue->issue->objectType = $object->type;
$issue->issue->objectID = $object->id;
/* Parse markdown description to html. */
$issue->issue->description = $this->app->loadClass('hyperdown')->makeHtml($issue->issue->description);
if(!isset($this->config->gitlab->maps->{$object->type})) return false;
$issue->object = $this->issueToZentaoObject($issue->issue, $gitlabID);
return $issue;
@@ -967,7 +970,7 @@ class gitlabModel extends model
if(!isset($this->config->gitlab->maps->{$issue->objectType})) return null;
$maps = $this->config->gitlab->maps->{$issue->objectType};
$gitlabUsers = $this->getUserAccountIdPairs($gitlabID);
$gitlabUsers = $this->getUserIdAccountPairs($gitlabID);
$object = new stdclass;
$object->id = $issue->objectID;