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

Merge branch 'devops20_caoyanyi' into 'devops20'

Browse Source 
Devops20 caoyanyi

See merge request easycorp/zentaopms!1563
This commit is contained in:
李玉春
2022-01-24 06:31:27 +00:00
parent ddc2cee664 b20110ba68
commit 033763cceb
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/model.php
+4 -4
View File
@@ -655,7 +655,8 @@ class gitlabModel extends model
/* Parse order string. */
$order = explode('_', $orderBy);
$result = commonModel::httpWithHeader($url . "&&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($url . "&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'];
@@ -2749,19 +2750,18 @@ class gitlabModel extends model
* Check user access.
*
* @param int $gitlabID
* @param int $openID
* @param int $projectID
* @param object $project
* @param string $maxRole
* @access public
* @return bool
*/
public function checkUserAccess($gitlabID, $openID = 0, $projectID = 0, $project = null, $groupIDList = array(), $maxRole = 'maintainer')
public function checkUserAccess($gitlabID, $projectID = 0, $project = null, $groupIDList = array(), $maxRole = 'maintainer')
{
if($this->app->user->admin) return true;
if($project == null) $project = $this->apiGetSingleProject($gitlabID, $projectID);
if(!$openID or !isset($project->id)) return false;
if(!isset($project->id)) return false;
$accessLevel = $this->config->gitlab->accessLevel[$maxRole];