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

* Modify mr projects get.

Browse Source
This commit is contained in:
caoyanyi
2023-04-13 16:00:40 +08:00
parent 6e3b635868
commit 63fa9d9fd5
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/model.php
+5 -4
View File
@@ -1020,16 +1020,17 @@ class gitlabModel extends model
/**
* Get single project by API.
*
* @param int $gitlabID
* @param int $projectID
* @param int $gitlabID
* @param int $projectID
* @param bool $useUser
* @access public
* @return object
*/
public function apiGetSingleProject($gitlabID, $projectID)
public function apiGetSingleProject($gitlabID, $projectID, $useUser = false)
{
if(isset($this->projects[$gitlabID][$projectID])) return $this->projects[$gitlabID][$projectID];
$url = sprintf($this->getApiRoot($gitlabID, false), "/projects/$projectID");
$url = sprintf($this->getApiRoot($gitlabID, $useUser), "/projects/$projectID");
$this->projects[$gitlabID][$projectID] = json_decode(commonModel::http($url, $data = null, $optionsi = array(), $headers = array(), $dataType = 'data', $method = 'POST', $timeout = 30, $httpCode = false, $log = false));
return $this->projects[$gitlabID][$projectID];
}
module/mr/control.php
+1 -1
View File
@@ -960,7 +960,7 @@ class mr extends control
$projects = $scm == 'gitlab' ? $this->$scm->apiGetForks($hostID, $projectID) : array();
/* Second step: get project itself. */
$projects[] = $this->$scm->apiGetSingleProject($hostID, $projectID);
$projects[] = $this->$scm->apiGetSingleProject($hostID, $projectID, true);
/* Last step: find its upstream recursively. */
$project = $this->$scm->apiGetUpstream($hostID, $projectID);