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

* Finish task #62872.

Browse Source
This commit is contained in:
liyuchun
2022-08-11 14:39:43 +08:00
parent 0ce4f4dd1d
commit 99dfc212ff
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gogs/model.php
+3 -3
View File
@@ -410,12 +410,12 @@ class gogsModel extends model
for($page = 1; true; $page++)
{
$url = sprintf($apiRoot, "/users/search") . "&page={$page}&limit=50";
$url = sprintf($apiRoot, "/admin/users") . "&page={$page}&limit=20";
$result = json_decode(commonModel::http($url));
if(empty($result->data)) break;
$response = array_merge($response, $result->data);
$page += 1;
break;
}
if(empty($response)) return array();
@@ -436,7 +436,7 @@ class gogsModel extends model
$user->email = zget($gogsUser, 'email', '');
$user->avatar = $gogsUser->avatar_url;
$user->createdAt = zget($gogsUser, 'created', '');
$user->lastActivityOn = zget($gogsUser, 'last_login', '');
$user->lastActivityOn = zget($gogsUser, 'login', '');
$users[] = $user;
}
module/gogs/view/browse.html.php
+2 -1
View File
@@ -38,7 +38,7 @@
<th class='c-id'><?php common::printOrderLink('id', $orderBy, $vars, $lang->gogs->id);?></th>
<th class='c-name w-300px'><?php common::printOrderLink('name', $orderBy, $vars, $lang->gogs->name);?></th>
<th class='text'><?php common::printOrderLink('url', $orderBy, $vars, $lang->gogs->url);?></th>
<th class='c-actions-2'><?php echo $lang->actions;?></th>
<th class='c-actions-3 text-center'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
@@ -56,6 +56,7 @@
<td class='c-actions'>
<?php
common::printIcon('gogs', 'edit', "gogsID=$id", '', 'list', 'edit');
echo common::buildIconButton('gogs', 'bindUser', "gogsID=$id", '', 'list', 'link', '', '', false, '', '', 0, $gogs->isBindUser);
common::printIcon('gogs', 'delete', "gogsID=$id", '', 'list', 'trash', 'hiddenwin');
?>
</td>