diff --git a/module/user/config.php b/module/user/config.php index 5a7b1a8dfb..6e505d70e1 100644 --- a/module/user/config.php +++ b/module/user/config.php @@ -24,9 +24,6 @@ $config->user->loginImg['logo'] = 'zt-login-logo.svg'; $config->user->loginImg['bg'] = 'zt-login-bg.svg'; $config->user->loginImg['ai'] = 'zt-login-ai.svg'; -/* User detail fields for API against JIHU GitLab. */ -$config->user->detailFields = 'id,account,realname,avatar'; - $config->user->defaultFields['todo'] = array('id', 'name', 'pri', 'date', 'begin', 'end', 'status', 'type'); $config->user->defaultFields['task'] = array('id', 'name', 'pri', 'status', 'execution', 'deadline', 'estimate', 'consumed', 'left'); $config->user->defaultFields['story'] = array('id', 'title', 'pri', 'status', 'product', 'plan', 'openedBy', 'estimate', 'stage'); diff --git a/module/user/model.php b/module/user/model.php index f261d9ca8b..b1ba1c2db6 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -2792,33 +2792,29 @@ class userModel extends model } /** - * Get users details for API. + * 为 GitLab API 获取用户列表。 + * Get user list for GitLab API. * - * @param array $userList + * @param array $accountList * @access public * @return array */ - public function getListForGitLabAPI($userList) + public function getListForGitLabAPI(array $accountList): array { - $users = $this->dao->select($this->config->user->detailFields)->from(TABLE_USER)->where("account")->in($userList)->fetchAll(); - - $userDetails = array(); - foreach($users as $index => $user) + /* 第二个参数设为空,确保返回的是一个索引数组。*/ + /* Set the second param to empty, to make sure the return is an indexed array. */ + $users = $this->getListByAccounts($accountList, ''); + foreach($users as $user) { - $user->url = helper::createLink('user', 'profile', "userID={$user->id}"); - - if($user->avatar != "") + if($user->avatar) { $user->avatar = common::getSysURL() . $user->avatar; - } - else - { - $user->avatar = "https://www.gravatar.com/avatar/" . md5($user->account) . "?d=identicon&s=80"; + continue; } - $userDetails[$user->account] = $user; + $user->avatar = "https://www.gravatar.com/avatar/" . md5($user->account) . "?d=identicon&s=80"; } - return $userDetails; + return $users; } /**