diff --git a/module/gitlab/model.php b/module/gitlab/model.php index d2d3109f3f..11d5d75910 100644 --- a/module/gitlab/model.php +++ b/module/gitlab/model.php @@ -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); diff --git a/module/gitlab/view/binduser.html.php b/module/gitlab/view/binduser.html.php index 07dea50359..c83bea3e6e 100644 --- a/module/gitlab/view/binduser.html.php +++ b/module/gitlab/view/binduser.html.php @@ -33,7 +33,8 @@ realname;?>
- email) echo $gitlabUser->account . " <" . $gitlabUser->email . ">";?> + account;?> + email) echo " <" . $gitlabUser->email . ">";?> id]", $userPairs, '', "class='form-control select chosen'" );?> @@ -46,7 +47,8 @@ realname;?>
- email) echo $gitlabUser->account . " <" . $gitlabUser->email . ">";?> + account;?> + email) echo " <" . $gitlabUser->email . ">";?> id]", $userPairs, $gitlabUser->zentaoAccount, "class='form-control select chosen'" );?>