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

* Adjust bind user.

Browse Source
This commit is contained in:
liyuchun
2022-01-20 13:27:31 +08:00
parent c561a9b666
commit b9c90fcd25
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/model.php
+2 -2
View File
@@ -478,8 +478,8 @@ class gitlabModel extends model
while(true)
{
/* Also use `per_page=20` to fetch users in API. Fetch active users only. */
$url = sprintf($apiRoot, "/users") . "&order_by={$order}&sort={$sort}&page={$page}&per_page=20&active=true";
$result = json_decode(commonModel::http($url));
$url = sprintf($apiRoot, "/users") . "&order_by={$order}&sort={$sort}&page={$page}&per_page=20&active=true";
$result = json_decode(commonModel::http($url));
if(!empty($result))
{
$response = array_merge($response, $result);
module/gitlab/view/binduser.html.php
+4 -2
View File
@@ -33,7 +33,8 @@
<td class='text-left'>
<strong><?php echo $gitlabUser->realname;?></strong>
<br>
<?php if($gitlabUser->email) echo $gitlabUser->account . " &lt;" . $gitlabUser->email . "&gt;";?>
<?php echo $gitlabUser->account;?>
<?php if($gitlabUser->email) echo " &lt;" . $gitlabUser->email . "&gt;";?>
</td>
<td><?php echo html::select("zentaoUsers[$gitlabUser->id]", $userPairs, '', "class='form-control select chosen'" );?></td>
<td></td>
@@ -46,7 +47,8 @@
<td>
<strong><?php echo $gitlabUser->realname;?></strong>
<br>
<?php if($gitlabUser->email) echo $gitlabUser->account . " &lt;" . $gitlabUser->email . "&gt;";?>
<?php echo $gitlabUser->account;?>
<?php if($gitlabUser->email) echo " &lt;" . $gitlabUser->email . "&gt;";?>
</td>
<td><?php echo html::select("zentaoUsers[$gitlabUser->id]", $userPairs, $gitlabUser->zentaoAccount, "class='form-control select chosen'" );?></td>
<td>