From 99dfc212ff3be8f5e72b7334eff2c21679a7420a Mon Sep 17 00:00:00 2001
From: liyuchun <563917701@qq.com>
Date: Thu, 11 Aug 2022 14:39:43 +0800
Subject: [PATCH]  * Finish task #62872.

---
 module/gogs/model.php            | 6 +++---
 module/gogs/view/browse.html.php | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/module/gogs/model.php b/module/gogs/model.php
index 75774c17ae..e3a6f7adcb 100644
--- a/module/gogs/model.php
+++ b/module/gogs/model.php
@@ -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;
         }
diff --git a/module/gogs/view/browse.html.php b/module/gogs/view/browse.html.php
index 14c6ca081c..d925058381 100644
--- a/module/gogs/view/browse.html.php
+++ b/module/gogs/view/browse.html.php
@@ -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>