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

Merge branch '15.4'

Browse Source
This commit is contained in:
王怡栋
2021-09-02 19:21:30 +08:00
parent 28be8dbc61 3fb14ef213
commit 4eee4d5523
35 changed files with 228 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/model.php
+3 -1
View File
@@ -413,8 +413,10 @@ class gitlabModel extends model
$allResults = array();
for($page = 1; true; $page ++)
{
$results = json_decode(commonModel::http($host . "?private_token={$gitlab->token}&simple=true&page={$page}&per_page=100"));
$results = json_decode(commonModel::http($host . "?private_token={$gitlab->token}&simple=true&membership=true&page={$page}&per_page=100"));
if(isset($results->error)) break;
if(empty($results) or $page > 10) break;
$allResults = array_merge($allResults, $results);
}
module/gitlab/view/browse.html.php
+1 -1
View File
@@ -46,7 +46,7 @@
<td class='text' title='<?php echo $gitlab->url;?>'><?php echo $gitlab->url;?></td>
<td class='c-actions text-left'>
<?php
$disabled = !$gitlab->isAdminToken ? 'disabled' : '';
$disabled = !empty($gitlab->isAdminToken) ? '' : 'disabled';
common::printLink('gitlab', 'edit', "gitlabID=$id", "<i class='icon icon-edit'></i> ", '',"title={$lang->gitlab->edit} class='btn btn-primary'");
common::printLink('gitlab', 'bindUser', "id=$id", "<i class='icon icon-group'></i> ", '', "title={$lang->gitlab->bindUser} class='btn btn-primary {$disabled}' ,'disabled'");
if(common::hasPriv('gitlab', 'delete')) echo html::a($this->createLink('gitlab', 'delete', "gitlabID=$id"), '<i class="icon-trash"></i>', 'hiddenwin', "title='{$lang->gitlab->delete}' class='btn'");