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

* Add objectID to object for apiUpdateIssue(bug fix).

Browse Source
This commit is contained in:
dingguodong
2021-07-09 17:22:27 +08:00
parent 5de789ad8d
commit 677a3b0052
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/model.php
+3 -2
View File
@@ -610,8 +610,9 @@ class gitlabModel extends model
* @access public
* @return object
*/
public function apiUpdateIssue($gitlabID, $projectID, $issueID, $objectType, $object)
public function apiUpdateIssue($gitlabID, $projectID, $issueID, $objectType, $object, $objectID = null)
{
if(!isset($object->id) && !empty($objectID)) $object->id = $objectID;
$issue = $this->parseObjectToIssue($gitlabID, $projectID, $objectType, $object);
$apiRoot = $this->getApiRoot($gitlabID);
$url = sprintf($apiRoot, "/projects/{$projectID}/issues/{$issueID}");
@@ -1124,7 +1125,7 @@ class gitlabModel extends model
/* Append this object link in zentao to gitlab issue description */
$zentaoLink = common::getSysURL() . helper::createLink($objectType, 'view', "id={$object->id}");
$issue->description = $issue->description . "\n\n" . $zentaoLink;
if(strpos($issue->description, $zentaoLink) == false) $issue->description = $issue->description . "\n\n" . $zentaoLink;
return $issue;
}