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

Revert "Merge branch 'devops_caoyanyi' into 'master'"

Browse Source 
This reverts merge request !1515
This commit is contained in:
李玉春
2022-01-20 05:42:05 +00:00
parent 98d5844e64
commit 39e8a3fae7
4 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/control.php
+1 -1
View File
@@ -820,7 +820,7 @@ class gitlab extends control
$this->app->loadClass('pager', $static = true);
$recTotal = count($branches);
$pager = new pager($recTotal, $recPerPage, $pageID);
$branchList = is_array($branches) ? array_chunk($branches, $pager->recPerPage) : array();
$branchList = array_chunk($branches, $pager->recPerPage);
$this->view->keyword = $keyword;
$this->view->pager = $pager;
module/gitlab/model.php
+15 -20
View File
@@ -56,23 +56,15 @@ class gitlabModel extends model
/**
* Get gitlab api base url by gitlab id.
*
* @param int $gitlabID
* @param int $id
* @access public
* @return string
*/
public function getApiRoot($gitlabID)
public function getApiRoot($id)
{
$gitlab = $this->getByID($gitlabID);
$gitlab = $this->getByID($id);
if(!$gitlab) return '';
$sudoParam = '';
if(!$this->app->user->admin)
{
$openID = $this->getUserIDByZentaoAccount($gitlabID, $this->app->user->account);
if($openID) $sudoParam = "&sudo={$openID}";
}
return rtrim($gitlab->url, '/') . '/api/v4%s' . "?private_token={$gitlab->token}" . $sudoParam;
return rtrim($gitlab->url, '/') . '/api/v4%s' . "?private_token={$gitlab->token}";
}
/**
@@ -621,15 +613,17 @@ class gitlabModel extends model
*/
public function apiGetProjectsPager($gitlabID, $keyword = '', $orderBy = 'id_desc', $pager = null)
{
$apiRoot = $this->getApiRoot($gitlabID);
if(!$apiRoot) return array();
$gitlab = $this->getByID($gitlabID);
if(!$gitlab) return array();
$url = sprintf($apiRoot, "/projects");
$host = rtrim($gitlab->url, '/');
$host .= '/api/v4/projects';
/* Parse order string. */
$order = explode('_', $orderBy);
$result = commonModel::httpWithHeader($url . "&simple=true&&per_page={$pager->recPerPage}&order_by={$order[0]}&sort={$order[1]}&page={$pager->pageID}&search={$keyword}&search_namespaces=true");
$keyword = urlencode($keyword);
$result = commonModel::httpWithHeader($host . "?private_token={$gitlab->token}&simple=true&&per_page={$pager->recPerPage}&order_by={$order[0]}&sort={$order[1]}&page={$pager->pageID}&search={$keyword}&search_namespaces=true");
$header = $result['header'];
$recTotal = $header['X-Total'];
@@ -648,15 +642,16 @@ class gitlabModel extends model
*/
public function apiGetProjects($gitlabID)
{
$apiRoot = $this->getApiRoot($gitlabID);
if(!$apiRoot) return array();
$gitlab = $this->getByID($gitlabID);
if(!$gitlab) return array();
$url = sprintf($apiRoot, "/projects");
$host = rtrim($gitlab->url, '/');
$host .= '/api/v4/projects';
$allResults = array();
for($page = 1; true; $page++)
{
$results = json_decode(commonModel::http($host . "&simple=true&page={$page}&per_page=100"));
$results = json_decode(commonModel::http($host . "?private_token={$gitlab->token}&simple=true&page={$page}&per_page=100"));
if(!is_array($results)) break;
if(!empty($results)) $allResults = array_merge($allResults, $results);
if(count($results)<100 or $page > 10) break;
module/job/model.php
-2
View File
@@ -21,8 +21,6 @@ class jobModel extends model
public function getByID($id)
{
$job = $this->dao->select('*')->from(TABLE_JOB)->where('id')->eq($id)->fetch();
if(empty($job)) return new stdClass();
if(strtolower($job->engine) == 'gitlab')
{
$pipeline = json_decode($job->pipeline);
module/mr/view/view.html.php
+2 -2
View File
@@ -139,9 +139,9 @@
</tr>
<tr>
<th><?php echo $lang->compile->atTime;?></th>
<td><?php echo zget($compileJob, 'lastExec', $lang->mr->compileUnexecuted);?></td>
<td><?php echo $compileJob ? $compileJob->lastExec : $lang->mr->compileUnexecuted;?></td>
</tr>
<?php if($compileJob && !empty($compileJob->id)):?>
<?php if($compileJob):?>
<tr>
<th><?php echo $lang->compile->result;?></th>
<td>